Merge branch 'pair.CaloEvent-20190326' into 'master'

CaloEvent: Generate pair_base dictionaries.

See merge request atlas/athena!22135

Calorimeter/CaloEvent/CaloEvent/CaloEventDict.h

 /*
-  Copyright (C) 2002-2017 CERN for the benefit of the ATLAS collaboration
+  Copyright (C) 2002-2019 CERN for the benefit of the ATLAS collaboration
 */
 
 /***************************************************************************
@@ -63,6 +63,8 @@ namespace CaloDict{
     ElementLink<CaloShowerContainer>                     m_link4;
     std::pair<ElementLink<CaloShowerContainer>,double>   m_pair4;
 
+    std::pair<unsigned int,double>                       m_pair5;
+
     Navigable<CaloCellLinkContainer,double>              m_navCellLink;
     Navigable<CaloClusterContainer,double>               m_navCluster;
 

Calorimeter/CaloEvent/CaloEvent/selection.xml

@@ -54,7 +54,7 @@
 
   <class name="CaloClusterCellLink" />
   <class name="std::vector<std::pair<unsigned int,double> >" />
-  <class name="std::pair<unsigned int,double>" />
+  <class pattern="std::*pair*<unsigned int*double>" />
   <class name="DataVector<CaloClusterCellLink>" />
   <class name="CaloClusterCellLinkContainer"
 	 id="545AC204-2749-4AAC-9783-B1E5A7A0030F" />