Merge branch 'dict.xAODCaloEvent-20201022' into 'master'

xAODCaloEvent+xAODPFlow+AthContainersRoot; Dictionary fixes

See merge request atlas/athena!37539

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;

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/xAODPFlow/xAODPFlow/selection.xml

@@ -47,6 +47,7 @@
    <class name="std::pair<ElementLink<xAOD::CaloClusterContainer_v1>,double>" />
    <class name="std::vector<std::pair<ElementLink<xAOD::CaloClusterContainer_v1>,double> >" />
    <class name="std::vector<std::vector<std::pair<ElementLink<xAOD::CaloClusterContainer_v1>,double> > >" />
+   <class name="SG::AuxTypeVectorFactory<std::vector<std::pair<ElementLink<xAOD::CaloClusterContainer_v1>,double> > >" />
    <class name="std::vector<xAOD::PFODetails::PFOLeptonType>" />
 
 </lcgdict>

Event/xAOD/xAODPFlow/xAODPFlow/xAODPFlowDict.h

@@ -47,6 +47,7 @@ namespace {
      std::vector< std::pair< ElementLink< xAOD::CaloClusterContainer >, double > > FlowElemdummy2;
      std::vector< std::vector< std::pair< ElementLink< xAOD::CaloClusterContainer >, double > > > FlowElemdummy3;
      std::vector< xAOD::PFODetails::PFOLeptonType > FlowElemdummy4;
+     SG::AuxTypeVectorFactory<std::vector< std::pair< ElementLink< xAOD::CaloClusterContainer >, double> > > FlowElemdummy5;
      
 
    };