Control/AthContainersRoot/src/getDynamicAuxID.cxx

 /*
-  Copyright (C) 2002-2017 CERN for the benefit of the ATLAS collaboration
+  Copyright (C) 2002-2020 CERN for the benefit of the ATLAS collaboration
 */
-
-// $Id$
 /**
  * @file AthContainersRoot/src/getDynamicAuxID.h
  * @author scott snyder <snyder@bnl.gov>
@@ -32,7 +30,16 @@ TClass* getClassIfDictionaryExists (const std::string& cname)
     return nullptr;
   }
 
-  if (gInterpreter->GetClassSharedLibs (cname.c_str())) {
+  // The idea of calling GetClassSharedLibs was to test if a class was
+  // listed in the rootmap file, so we could avoid autoparsing.
+  // This worked with older versions of root 6.
+  // But now root has started doing dynamic linking itself,
+  // and GetClassSharedLibs will itself trigger autoparsing.
+  // So currently, this test does more harm than good.
+  // Still need to see if we can find a reliable way of failing
+  // a TClass lookup rather than triggering autoparsing.
+  //if (gInterpreter->GetClassSharedLibs (cname.c_str()))
+  {
     TClass* cl = TClass::GetClass (cname.c_str());
     if (cl->HasDictionary())
       return cl;

Control/AthToolSupport/AsgTools/AsgTools/CLASS_DEF.h

-/*
-  Copyright (C) 2002-2019 CERN for the benefit of the ATLAS collaboration
-*/
-
-// David Adams
-// January 2014
-//
-// Wrapper for Athena CLASS_DEF macro.
-// Ignores the macro in other environments.
-//
-// Note that the clid command can be used to generate the class ID:
-//   clid -m MyClassName
-
-// Set this flag to show calls to CLASS_DEF in stanadlone environments.
-//#define CLASSDEF_SHOWDEFS
-#ifndef XAOD_STANDALONE
-  #undef CLASSDEF_SHOWDEFS
-#endif
-
-#ifdef CLASSDEF_SHOWDEFS
-#include <iostream>
-int announce(const char* name, int clid) {
-  std::cout << "*********************** Loading clid for " << name << ": " << clid << std::endl;
-  return clid;
-}
-#endif
-
-#ifndef XAOD_STANDALONE
-  #include "AthenaKernel/CLASS_DEF.h"
-#else
-  #ifdef CLASSDEF_SHOWDEFS
-    #define CLASS_DEF(NAME, CLID, VER) int clid_CLASS = announce(#NAME, CLID);
-  #else
-    // Do not define macro if someone else has already done so.
-    #ifndef CLASS_DEF
-      #define CLASS_DEF(NAME, CLID, VER)
-    #endif
-  #endif
-#endif

Control/AthenaMonitoring/share/DataQualitySteering_jobOptions.py

@@ -336,6 +336,7 @@ if DQMonFlags.doMonitoring():
       ConfigFlags.Detector.GeometrySCT=DetFlags.SCT_on()
       ConfigFlags.Detector.GeometryTRT=DetFlags.TRT_on()
       ConfigFlags.InDet.usePixelDCS=InDetFlags.usePixelDCS()
+      ConfigFlags.InDet.doTIDE_Ambi=InDetFlags.doTIDE_Ambi()
 
       ConfigFlags.Output.HISTFileName=DQMonFlags.histogramFile()
       ConfigFlags.DQ.FileKey=DQMonFlags.monManFileKey()

Control/xAODRootAccess/Root/TEvent.cxx

@@ -1429,30 +1429,32 @@ namespace xAOD {
          }
       }
 
-      // Prepare the objects for writing:
+      // Prepare the objects for writing. Note that we need to iterate over a
+      // copy of the m_outputObjects container. Since the putAux(...) function
+      // called inside the loop may itself add elements to the m_outputObject
+      // container.
       std::string unsetObjects;
-      Object_t::const_iterator itr = m_outputObjects.begin();
-      Object_t::const_iterator end = m_outputObjects.end();
-      for( ; itr != end; ++itr ) {
+      Object_t outputObjectsCopy = m_outputObjects;
+      for( auto& itr : outputObjectsCopy ) {
          // Check that a new object was provided in the event:
-         if( ! itr->second->isSet() ) {
+         if( ! itr.second->isSet() ) {
             // We are now going to fail. But let's collect the names of
             // all the unset objects:
             if( unsetObjects.size() ) {
-               unsetObjects.append( ", \"" + itr->first + "\"" );
+               unsetObjects.append( ", \"" + itr.first + "\"" );
             } else {
-               unsetObjects.append( "\"" + itr->first + "\"" );
+               unsetObjects.append( "\"" + itr.first + "\"" );
             }
             continue;
          }
          // Make sure that any dynamic auxiliary variables that
          // were added to the object after it was put into the event,
          // get added to the output:
-         if( ! putAux( *m_outTree, *( itr->second ) ) ) {
+         if( ! putAux( *m_outTree, *( itr.second ) ) ) {
             ::Error( "xAOD::TEvent::fill",
                      XAOD_MESSAGE( "Failed to put dynamic auxiliary variables "
                                    "in the output for object \"%s\"" ),
-                     itr->first.c_str() );
+                     itr.first.c_str() );
             return 0;
          }
       }
@@ -2235,7 +2237,7 @@ namespace xAOD {
       // If not, update the output manager. This can happen when we copy
       // objects from the input to the output files, and we process
       // multiple input files.
-         
+
       // Check if the output manager is of the right type:
       TAuxManager* mgr = dynamic_cast< TAuxManager* >( vitr->second );
       if( ! mgr ) {

Database/AthenaPOOL/EventSelectorAthenaPool/src/DoubleEventSelectorAthenaPool.cxx

@@ -83,7 +83,9 @@ StatusCode DoubleEventSelectorAthenaPool::next(IEvtSelector::Context& ctxt) cons
     if (!m_counterTool.empty() && !m_counterTool->preNext().isSuccess()) {
         ATH_MSG_WARNING("Failed to preNext() CounterTool.");
     }
-    if (m_evtCount > m_skipEvents && (m_skipEventSequence.empty() || m_evtCount != m_skipEventSequence.front())) {
+    if( m_evtCount > m_skipEvents
+        && (m_skipEventRanges.empty() || m_evtCount < m_skipEventRanges.front().first))
+    {
       if (!recordAttributeList().isSuccess()) {
         ATH_MSG_ERROR("Failed to record AttributeList.");
         return(StatusCode::FAILURE);
@@ -113,8 +115,8 @@ StatusCode DoubleEventSelectorAthenaPool::next(IEvtSelector::Context& ctxt) cons
         break;
       }
     } else {
-      if (!m_skipEventSequence.empty() && m_evtCount == m_skipEventSequence.front()) {
-        m_skipEventSequence.erase(m_skipEventSequence.begin());
+      while( !m_skipEventRanges.empty() && m_evtCount >= m_skipEventRanges.front().second ) {
+         m_skipEventRanges.erase(m_skipEventRanges.begin());
       }
       ATH_MSG_INFO("skipping event " << m_evtCount);
     }

Database/AthenaPOOL/EventSelectorAthenaPool/src/EventSelectorAthenaPool.cxx

@@ -79,6 +79,8 @@ StoreGateSvc* EventSelectorAthenaPool::eventStore() const {
    }
    return(m_activeStoreSvc->operator->());
 }
+#include <boost/tokenizer.hpp>
+#include <sstream>
 //________________________________________________________________________________
 StatusCode EventSelectorAthenaPool::initialize() {
    if (m_isSecondary.value()) {
@@ -97,8 +99,37 @@ StatusCode EventSelectorAthenaPool::initialize() {
 		      << "[ \"<collectionName>\" ] (list of collections)");
       return(StatusCode::FAILURE);
    }
-   m_skipEventSequence = m_skipEventSequenceProp.value();
-   std::sort(m_skipEventSequence.begin(), m_skipEventSequence.end());
+   boost::char_separator<char> sep_coma(","), sep_hyph("-");
+   boost::tokenizer  ranges(m_skipEventRangesProp.value(), sep_coma);
+   for( const std::string r: ranges ) {
+      boost::tokenizer  fromto(r, sep_hyph);
+      auto from_iter = fromto.begin();
+      std::stringstream strstr1( *from_iter );
+      long from, to;
+      strstr1 >> from;
+      if( ++from_iter != fromto.end() ) {
+         std::stringstream strstr2( *from_iter );
+         strstr2 >> to;
+      } else {
+         to = from;
+      }
+      m_skipEventRanges.push_back( std::pair(from,to) );
+   }
+
+   for( auto v : m_skipEventSequenceProp.value() ) {
+      m_skipEventRanges.push_back( std::pair(v,v) );
+   }
+   std::sort(m_skipEventRanges.begin(), m_skipEventRanges.end());
+   if( msgLvl(MSG::DEBUG) ) {
+      std::stringstream skip_ranges_ss;
+      for( auto& r: m_skipEventRanges ) {
+         if( not skip_ranges_ss.str().empty() ) skip_ranges_ss << ", ";
+         skip_ranges_ss << r.first;
+         if( r.first != r.second) skip_ranges_ss << "-" << r.second;
+      }
+      if( not skip_ranges_ss.str().empty() )
+         ATH_MSG_DEBUG("Events to skip: " << skip_ranges_ss.str());
+   }
    // CollectionType must be one of:
    if (m_collectionType.value() != "ExplicitROOT" && m_collectionType.value() != "ImplicitROOT") {
       ATH_MSG_FATAL("EventSelector.CollectionType must be one of: ExplicitROOT, ImplicitROOT (default)");
@@ -498,7 +529,9 @@ StatusCode EventSelectorAthenaPool::next(IEvtSelector::Context& ctxt) const {
       if (!m_counterTool.empty() && !m_counterTool->preNext().isSuccess()) {
          ATH_MSG_WARNING("Failed to preNext() CounterTool.");
       }
-      if (m_evtCount > m_skipEvents && (m_skipEventSequence.empty() || m_evtCount != m_skipEventSequence.front())) {
+      if( m_evtCount > m_skipEvents
+          && (m_skipEventRanges.empty() || m_evtCount < m_skipEventRanges.front().first))
+      {
          if (!m_eventStreamingTool.empty() && m_eventStreamingTool->isServer()) {
             std::string token = m_headerIterator->eventRef().toString();
             StatusCode sc = m_eventStreamingTool->putEvent(m_evtCount - 1, token.c_str(), token.length() + 1, 0);
@@ -548,8 +581,8 @@ StatusCode EventSelectorAthenaPool::next(IEvtSelector::Context& ctxt) const {
             break;
          }
       } else {
-         if (!m_skipEventSequence.empty() && m_evtCount == m_skipEventSequence.front()) {
-            m_skipEventSequence.erase(m_skipEventSequence.begin());
+         while( !m_skipEventRanges.empty() && m_evtCount >= m_skipEventRanges.front().second ) {
+            m_skipEventRanges.erase(m_skipEventRanges.begin());
          }
          ATH_MSG_INFO("skipping event " << m_evtCount);
       }

Database/AthenaPOOL/EventSelectorAthenaPool/src/EventSelectorAthenaPool.h

@@ -198,7 +198,7 @@ private: // properties
    Gaudi::Property<std::vector<std::string>> m_inputCollectionsProp{this, "InputCollections", {}, ""};
    mutable std::vector<std::string>::const_iterator m_inputCollectionsIterator ATLAS_THREAD_SAFE;
    void inputCollectionsHandler(Gaudi::Details::PropertyBase&);
-   /// Query, query string.
+   /// Query string passed to APR when opening DataHeader container (kind of useless).
    Gaudi::Property<std::string> m_query{this, "Query", "", ""};
 
    /// KeepInputFilesOpen, boolean flag to keep files open after PoolCollection reaches end: default = false.
@@ -233,7 +233,9 @@ private: // properties
    /// SkipEvents, numbers of events to skip: default = 0.
    Gaudi::Property<int> m_skipEvents{this, "SkipEvents", 0, ""};
    Gaudi::Property<std::vector<long>> m_skipEventSequenceProp{this, "SkipEventSequence", {}, ""};
-   mutable std::vector<long> m_skipEventSequence ATLAS_THREAD_SAFE;
+   /// Skip Events - comma separated list of event to skip, ranges with '-': <start> - <end>
+   Gaudi::Property<std::string> m_skipEventRangesProp{this, "SkipEventRanges", {}, ""};
+   mutable std::vector<std::pair<long,long>> m_skipEventRanges ATLAS_THREAD_SAFE;
 
    mutable std::atomic_int m_evtCount{}; // internal count of events
    mutable std::atomic_bool m_firedIncident{};

Database/AthenaPOOL/OutputStreamAthenaPool/python/MultipleStreamManager.py

@@ -566,8 +566,12 @@ class MultipleStreamManager:
         theStream.Stream.WritingTool.SubLevelBranchName = "<key>"
         svcMgr.AthenaPoolCnvSvc.PoolAttributes += [ "DatabaseName = '" + FileName + "'; COMPRESSION_LEVEL = '5'" ]
         svcMgr.AthenaPoolCnvSvc.PoolAttributes += [ "DatabaseName = '" + FileName + "'; ContainerName = 'TTree=CollectionTree'; TREE_AUTO_FLUSH = '-20000000'" ]
-        svcMgr.AthenaPoolCnvSvc.PoolAttributes += [ "DatabaseName = '" + FileName + "'; ContainerName = 'TTree=CollectionTree'; CONTAINER_SPLITLEVEL = '0'" ]
-        svcMgr.AthenaPoolCnvSvc.PoolAttributes += [ "DatabaseName = '" + FileName + "'; ContainerName = 'TTree=Aux.'; CONTAINER_SPLITLEVEL = '0'"]
+        CONTAINER_SPLITLEVEL = 0
+        # stream names come from PhysicsAnalysis/DerivationFramework/DerivationFrameworkCore/python/DerivationFrameworkProdFlags.py
+        if StreamName in ["StreamDAOD_PHYSLITE"]:
+            CONTAINER_SPLITLEVEL = 99
+        svcMgr.AthenaPoolCnvSvc.PoolAttributes += [ "DatabaseName = '" + FileName + "'; ContainerName = 'TTree=CollectionTree'; CONTAINER_SPLITLEVEL = '" + str(CONTAINER_SPLITLEVEL) + "'" ]
+        svcMgr.AthenaPoolCnvSvc.PoolAttributes += [ "DatabaseName = '" + FileName + "'; ContainerName = 'TTree=Aux.'; CONTAINER_SPLITLEVEL = '" + str(CONTAINER_SPLITLEVEL) + "'"]
         return theStream
 
 

Database/IOVDbTPCnv/IOVDbTPCnv/IOVPayloadContainerCnv_p1.h

@@ -48,6 +48,9 @@ private:
     // Attribute types
     std::map<std::string, unsigned int>    m_attributeTypeMap;
     std::vector<std::string>               m_attributeTypes;
+
+    unsigned int m_objIndexOffset[IOVPayloadContainer_p1::ATTR_TIME_STAMP+1];
+
 };
 
 #endif

Database/IOVDbTPCnv/src/IOVPayloadContainerCnv_p1.cxx

@@ -23,6 +23,10 @@ IOVPayloadContainerCnv_p1::persToTrans(const IOVPayloadContainer_p1* persObj,
             << endmsg;
     }
 
+    for( auto & offset : m_objIndexOffset ) {
+        offset = 1; // this is just the initial value before first use 
+    }
+
     IOVPayloadContainer::payloadVec& payloadVec = transObj->m_payloadVec;
     
     // Make sure transient container is empty - may be reused
@@ -135,7 +139,7 @@ IOVPayloadContainerCnv_p1::persToTrans(const IOVPayloadContainer_p1* persObj,
                     }
                 }
             }
-            
+
 
 //             std::ostringstream attrStr;
 //             attrList.toOutputStream(attrStr);       
@@ -560,53 +564,85 @@ IOVPayloadContainerCnv_p1::fillAttributeData(const IOVPayloadContainer_p1* persO
                                              coral::AttributeList& attrList,
                                              MsgStream & log)
 {
+    /*
+       this offset calculation solves the problem reported in
+       ATR-22116 trying to get past the limitation introduced by
+       AttrListIndexes::m_objIndex being of type short, which doesn't
+       cover the full length of the type-wise data vectors
+
+       It is assumed that when reading the persistent object entries,
+       the objIndex starts at 0, and increases by 1 each read for a given type.
+
+       One must also not call fillAttributeData multiple times for the
+       same (AttrListIndexes index), nor call them out of order
+
+       * There is one offset per type, initialized to 1
+       * In the first read of a type the offset is set to 0
+       * In all later reads the offset is not changed unless the objIndex equals 0
+         - if objIndex is fixed to be unsigned int, then objIndex should never be 0 in later reads
+         - if objIndex is unsigned short, then objIndex==0 only when it runs into the 65536 boundary
+           and the offset then gets increased by this amount
+
+       So this will work also when objIndex is integer
+     */
+
+    unsigned int objIndex = index.objIndex();
+    unsigned int & offset = m_objIndexOffset[index.typeIndex()];
+    if(offset == 1) {
+        offset = 0;
+    } else {
+        if(objIndex == 0) {
+            offset += 65536;
+        }
+    }
+
     // Fill persistent object with attribute data - must use switch
     // for all possible types
     switch (index.typeIndex()) {
         case IOVPayloadContainer_p1::ATTR_BOOL:
-            attrList[name].setValue(persObj->m_bool[index.objIndex()]);
+            attrList[name].setValue(persObj->m_bool[objIndex + offset]);
             break;
         case IOVPayloadContainer_p1::ATTR_CHAR:                
-            attrList[name].setValue(persObj->m_char[index.objIndex()]);
+            attrList[name].setValue(persObj->m_char[objIndex + offset]);
             break;
         case IOVPayloadContainer_p1::ATTR_UNSIGNED_CHAR:       
-            attrList[name].setValue(persObj->m_unsignedChar[index.objIndex()]);
+            attrList[name].setValue(persObj->m_unsignedChar[objIndex + offset]);
             break;
         case IOVPayloadContainer_p1::ATTR_SHORT:
-            attrList[name].setValue(persObj->m_short[index.objIndex()]);
+            attrList[name].setValue(persObj->m_short[objIndex + offset]);
             break;
         case IOVPayloadContainer_p1::ATTR_UNSIGNED_SHORT:      
-            attrList[name].setValue(persObj->m_unsignedShort[index.objIndex()]);
+            attrList[name].setValue(persObj->m_unsignedShort[objIndex + offset]);
             break;
         case IOVPayloadContainer_p1::ATTR_INT:                 
-            attrList[name].setValue(persObj->m_int[index.objIndex()]);
+            attrList[name].setValue(persObj->m_int[objIndex + offset]);
             break;
         case IOVPayloadContainer_p1::ATTR_UNSIGNED_INT:        
-            attrList[name].setValue(persObj->m_unsignedInt[index.objIndex()]);
+            attrList[name].setValue(persObj->m_unsignedInt[objIndex + offset]);
             break;
         case IOVPayloadContainer_p1::ATTR_LONG:                
-            attrList[name].setValue(persObj->m_long[index.objIndex()]);
+            attrList[name].setValue(persObj->m_long[objIndex + offset]);
             break;
         case IOVPayloadContainer_p1::ATTR_UNSIGNED_LONG:       
-            attrList[name].setValue(persObj->m_unsignedLong[index.objIndex()]);
+            attrList[name].setValue(persObj->m_unsignedLong[objIndex + offset]);
             break;
         case IOVPayloadContainer_p1::ATTR_LONG_LONG:           
-            attrList[name].setValue(persObj->m_longLong[index.objIndex()]);
+            attrList[name].setValue(persObj->m_longLong[objIndex + offset]);
             break;
         case IOVPayloadContainer_p1::ATTR_UNSIGNED_LONG_LONG: 
-            attrList[name].setValue(persObj->m_unsignedLongLong[index.objIndex()]);
+            attrList[name].setValue(persObj->m_unsignedLongLong[objIndex + offset]);
             break;
         case IOVPayloadContainer_p1::ATTR_FLOAT:               
-            attrList[name].setValue(persObj->m_float[index.objIndex()]);
+            attrList[name].setValue(persObj->m_float[objIndex + offset]);
             break;
         case IOVPayloadContainer_p1::ATTR_DOUBLE:              
-            attrList[name].setValue(persObj->m_double[index.objIndex()]);
+            attrList[name].setValue(persObj->m_double[objIndex + offset]);
             break;
         case IOVPayloadContainer_p1::ATTR_LONG_DOUBLE:         
-//             attrList[name].setValue(persObj->m_longDouble[index.objIndex()]);
+//             attrList[name].setValue(persObj->m_longDouble[objIndex + offset]);
             break;
-        case IOVPayloadContainer_p1::ATTR_STRING:              
-            attrList[name].setValue(persObj->m_string[index.objIndex()]);
+        case IOVPayloadContainer_p1::ATTR_STRING:
+            attrList[name].setValue(persObj->m_string[objIndex + offset]);
             break;
         case IOVPayloadContainer_p1::ATTR_BLOB:                
             log << MSG::ERROR 
@@ -615,14 +651,14 @@ IOVPayloadContainerCnv_p1::fillAttributeData(const IOVPayloadContainer_p1* persO
             return;
         case IOVPayloadContainer_p1::ATTR_DATE:
           {
-            coral::TimeStamp::ValueType  ns( persObj->m_date[index.objIndex()] ); 
+            coral::TimeStamp::ValueType  ns( persObj->m_date[objIndex + offset] );
             attrList[name].setValue( coral::Date(coral::TimeStamp(ns).time()) );
             break;
           }
         case IOVPayloadContainer_p1::ATTR_TIME_STAMP:
           {
             coral::TimeStamp::ValueType  ns =
-              coral::TimeStamp::ValueType( persObj->m_timeStamp[index.objIndex()] ); 
+              coral::TimeStamp::ValueType( persObj->m_timeStamp[objIndex + offset] );
             attrList[name].setValue( coral::TimeStamp(ns) );
             break;
           }

DetectorDescription/GeoPrimitives/GeoPrimitives/ATLAS_CHECK_THREAD_SAFETY

+DetectorDescription/GeoPrimitives

Event/xAOD/xAODBTagging/CMakeLists.txt

@@ -10,7 +10,7 @@ find_package( xAODUtilities )
 atlas_add_library( xAODBTagging
    xAODBTagging/*.h xAODBTagging/versions/*.h Root/*.cxx
    PUBLIC_HEADERS xAODBTagging
-   LINK_LIBRARIES AthContainers AthLinks xAODBase xAODCore xAODTracking
+   LINK_LIBRARIES AthContainers AthLinks xAODBase xAODCore xAODTracking xAODJet
    CxxUtils )
 
 atlas_add_xaod_smart_pointer_dicts(

Event/xAOD/xAODBTagging/Root/BTaggingUtilities.cxx

+
+#include "xAODBTagging/BTaggingUtilities.h"
+
+using namespace xAOD;
+
+const xAOD::BTagging* BTaggingUtilities::getBTagging( const SG::AuxElement& auxElement,
+						      const std::string& linkName ) {
+  const SG::AuxElement::Accessor< ElementLink< xAOD::BTaggingContainer > > btagAcc( linkName );
+  
+  if ( btagAcc.isAvailable( auxElement ) && btagAcc( auxElement ).isValid() )
+    return *( btagAcc( auxElement ) );
+  
+  return nullptr;
+}
+
+const ElementLink< xAOD::BTaggingContainer >& BTaggingUtilities::getBTaggingLink( const SG::AuxElement& auxElement,
+										  const std::string& linkName ) {
+  const SG::AuxElement::Accessor< ElementLink< xAOD::BTaggingContainer > > btagAcc( linkName );
+  return btagAcc( auxElement );
+}
+
+void BTaggingUtilities::setBTaggingLink( const SG::AuxElement& auxElement,
+					 const ElementLink< xAOD::BTaggingContainer >& el,
+					 const std::string& linkName ) {
+  const SG::AuxElement::Decorator< ElementLink< xAOD::BTaggingContainer > > btagDec( linkName );
+  btagDec( auxElement ) = el;
+}

Event/xAOD/xAODBTagging/xAODBTagging/BTaggingUtilities.h

+#ifndef XAODBTAGGING_UTILITIES_H
+#define XAODBTAGGING_UTILITIES_H
+
+#include "AthContainers/AuxElement.h"
+#include "xAODBTagging/BTaggingContainer.h"
+
+namespace xAOD::BTaggingUtilities {
+    const xAOD::BTagging* getBTagging( const SG::AuxElement&,
+				       const std::string& linkName="btaggingLink" );
+    const ElementLink< xAOD::BTaggingContainer >& getBTaggingLink( const SG::AuxElement&,
+								   const std::string& linkName="btaggingLink" );
+    void setBTaggingLink( const SG::AuxElement&,
+			  const ElementLink< xAOD::BTaggingContainer >&,
+			  const std::string& linkName="btaggingLink" );
+} // namespace xAOD::BTaggingUtilities
+
+#endif

Event/xAOD/xAODBTagging/xAODBTagging/versions/BTaggingContainer_v1.h

 // Dear emacs, this is -*- c++ -*-
 
 /*
-  Copyright (C) 2002-2017 CERN for the benefit of the ATLAS collaboration
+  Copyright (C) 2002-2020 CERN for the benefit of the ATLAS collaboration
 */
 
 // $Id: BTaggingContainer_v1.h 631475 2014-11-27 11:53:05Z filthaut $
@@ -15,7 +15,7 @@
 #include "xAODBTagging/versions/BTagging_v1.h"
 
 namespace xAOD {
-   /// The container is a simple typedef for now
+   // The container is a simple typedef for now
    typedef DataVector< xAOD::BTagging_v1 > BTaggingContainer_v1;
 }
 

Event/xAOD/xAODBTagging/xAODBTagging/versions/BTagging_v1.h

@@ -16,6 +16,7 @@
 #include "xAODBTagging/BTaggingEnums.h"
 #include "xAODTracking/TrackParticleContainer.h"
 #include "xAODTracking/VertexContainer.h"
+#include "xAODJet/JetContainer.h"
 #include "xAODBTagging/BTagVertexContainer.h"
 
 // STL include(s):

Event/xAOD/xAODCaloEvent/xAODCaloEvent/selection.xml

@@ -35,6 +35,7 @@
    <class name="xAOD::CaloClusterBadChannelData_v1" />
    <class name="std::vector<xAOD::CaloClusterBadChannelData_v1>" />
    <class name="std::vector<std::vector<xAOD::CaloClusterBadChannelData_v1> >" />
+   <class name="SG::AuxTypeVectorFactory<std::vector<xAOD::CaloClusterBadChannelData_v1> >" />
    <typedef name="xAOD::CaloClusterBadChannelData" />
    <typedef name="xAOD::CaloClusterBadChannelList" />
   

Event/xAOD/xAODCaloEvent/xAODCaloEvent/xAODCaloEventDict.h

@@ -38,6 +38,7 @@ namespace {
       XAOD_INSTANTIATE_NS_CONTAINER_TYPES( xAOD, CaloTowerContainer_v1 );
       std::vector< xAOD::CaloClusterBadChannelData_v1 > v1;
       std::vector< std::vector< xAOD::CaloClusterBadChannelData_v1 > > v2;
+      SG::AuxTypeVectorFactory<std::vector< xAOD::CaloClusterBadChannelData_v1 >  > v3;
    };
 }
 

Event/xAOD/xAODCore/xAODCore/CLASS_DEF.h

@@ -38,10 +38,6 @@
 // Include the ClassID_traits class:
 #include "xAODCore/ClassID_traits.h"
 
-// Make sure that we get rid of the definitions from other places.
-// From AsgTools for instance...
-#undef CLASS_DEF
-
 // Present a dummy macro to ROOT 6's dictionary generator. Otherwise
 // it becomes over-eager, and starts generating dictionaries for types
 // that it should just ignore.

Event/xAOD/xAODJet/CMakeLists.txt

@@ -17,7 +17,7 @@ endif()
 set( extra_srcs )
 if( NOT SIMULATIONBASE AND NOT GENERATIONBASE )
    set( extra_srcs Root/JetTrigAuxContainer*.cxx )
-   set( extra_libs xAODBTagging xAODPFlow xAODTrigger )
+   set( extra_libs xAODPFlow xAODTrigger )
 endif()
 
 # External dependencies: