Merge branch 'dict-fix' into 'master'

More pair_base dictionary fixes for InDet and MuonSpectrometer

See merge request atlas/athena!22158

InnerDetector/InDetEventCnv/InDetEventAthenaPool/InDetEventAthenaPool/selection.xml

 <lcgdict>
   <class name="std::vector<HepMcParticleLink_p1>" />
   <class name="InDetSimData_p1" />
-  <class name="std::pair<unsigned int, InDetSimData_p1>" />
+  <class pattern="std::*pair*<unsigned int, InDetSimData_p1>" />
   <class name="std::vector<std::pair<unsigned int, InDetSimData_p1> >" />
-  <class name="std::pair<unsigned long long, InDetSimData_p1>" />
+  <class pattern="std::*pair*<unsigned long long, InDetSimData_p1>" />
   <class name="std::vector<std::pair<unsigned long long, InDetSimData_p1> >" />
   <class name="std::vector<HepMcParticleLink_p2>" />
   <class name="InDetSimData_p2" />
-  <class name="std::pair<unsigned int, InDetSimData_p2>" />
+  <class pattern="std::*pair*<unsigned int, InDetSimData_p2>" />
   <class name="std::vector<std::pair<unsigned int, InDetSimData_p2> >" />
-  <class name="std::pair<unsigned long long, InDetSimData_p2>" />
+  <class pattern="std::*pair*<unsigned long long, InDetSimData_p2>" />
   <class name="std::vector<std::pair<unsigned long long, InDetSimData_p2> >" />
   <class name="InDetSimDataCollection_p1" id="333EF996-1672-4AB8-917D-187F908F1EDE" />
   <class name="InDetSimDataCollection_p2" id="C648CA66-013D-44AC-B0D9-99BFB0060E84" />

InnerDetector/InDetRawEvent/InDetSimData/InDetSimData/selection.xml

 <lcgdict>
  <class name="InDetSimDataCollection" id="5A50C32E-C036-4A49-AE97-716D53210BE1" />
      <class name="InDetSimData" />
-     <class name="std::pair< HepMcParticleLink , float>" /> 
+     <class pattern="std::*pair*< HepMcParticleLink , float>" /> 
      <class name="std::vector<std::pair< HepMcParticleLink , float> >" />
      <class name="std::map<Identifier,InDetSimData>" />
 </lcgdict>

MuonSpectrometer/MuonCnv/MuonEventTPCnv/MuonEventTPCnv/selection.xml

@@ -105,14 +105,14 @@
     <class name="Muon::MuonMCData_p1" />
     <class pattern="std::*pair*<HepMcParticleLink_p1, Muon::MuonMCData_p1>" />
     <class name="std::vector<std::pair<HepMcParticleLink_p1, Muon::MuonMCData_p1> >" />
+    <class pattern="std::*pair*<HepMcParticleLink_p2, Muon::MuonMCData_p1>" />
+    <class name="std::vector<std::pair<HepMcParticleLink_p2, Muon::MuonMCData_p1> >" />
     <class pattern="std::*pair*<unsigned int, Muon::MuonSimData_p1>" />
     <class name="std::vector< std::pair<unsigned int, Muon::MuonSimData_p1> >" />
     <class name="Muon::MuonSimDataCollection_p1" id="0605B4A3-3744-4486-B39D-F9C9E809D868"/>
 
     <class name="Muon::MuonSimData_p2" />
-    <class name="std::pair<HepMcParticleLink_p2, Muon::MuonMCData_p1>" />
-    <class name="std::vector<std::pair<HepMcParticleLink_p2, Muon::MuonMCData_p1> >" />
-    <class name="std::pair<unsigned int, Muon::MuonSimData_p2>" />
+    <class pattern="std::*pair*<unsigned int, Muon::MuonSimData_p2>" />
     <class name="std::vector< std::pair<unsigned int, Muon::MuonSimData_p2> >" />
     <class name="Muon::MuonSimDataCollection_p2" id="E0AA3013-4EF7-45B6-BDB1-17B21BF60791"/>
 
@@ -120,6 +120,8 @@
     <class name="Muon::CscMcData_p1" />
     <class pattern="std::*pair*<HepMcParticleLink_p1, Muon::CscMcData_p1>" />
     <class name="std::vector<std::pair<HepMcParticleLink_p1, Muon::CscMcData_p1> >" />
+    <class pattern="std::*pair*<HepMcParticleLink_p2, Muon::CscMcData_p1>" />
+    <class name="std::vector<std::pair<HepMcParticleLink_p2, Muon::CscMcData_p1> >" />
     <class pattern="std::*pair*<unsigned int, Muon::CscSimData_p1>" />
     <class name="std::vector< std::pair<unsigned int, Muon::CscSimData_p1> >" />
     <class name="Muon::CscSimDataCollection_p1" id="DD2A8397-4435-4DA2-AD14-ADD7294694B2"/>
@@ -136,9 +138,7 @@
     <class name="Muon::MM_RawDataContainer_p1" id="5F202045-CE2C-4AD4-96BA-7DA18053B90F" />
 
     <class name="Muon::CscSimData_p2" />
-    <class name="std::pair<HepMcParticleLink_p2, Muon::CscMcData_p1>" />
-    <class name="std::vector<std::pair<HepMcParticleLink_p2, Muon::CscMcData_p1> >" />
-    <class name="std::pair<unsigned int, Muon::CscSimData_p2>" />
+    <class pattern="std::*pair*<unsigned int, Muon::CscSimData_p2>" />
     <class name="std::vector< std::pair<unsigned int, Muon::CscSimData_p2> >" />
     <class name="Muon::CscSimDataCollection_p2" id="023993E1-BAAA-4F36-8CD4-8F03E3983E8D"/>