diff --git a/LArCalorimeter/LArRawConditions/LArRawConditions/selection1.xml b/LArCalorimeter/LArRawConditions/LArRawConditions/selection1.xml
index 2cbf66b5d914a0e8d6203c2c4df60ac0020440fc..ecb1b5ddb15be4fcacba8b3a3f3092f25baec801 100644
--- a/LArCalorimeter/LArRawConditions/LArRawConditions/selection1.xml
+++ b/LArCalorimeter/LArRawConditions/LArRawConditions/selection1.xml
@@ -49,7 +49,7 @@
   <class name="std::vector<LArAutoCorrP>"/>
   <class name="std::vector<std::pair<unsigned int, LArAutoCorrP> >"/>
   <class name="std::vector<std::pair<unsigned int, std::vector<LArAutoCorrP> > >"/>
-  <class pattern="*iterator<const*LArAutoCorrP*"/>
+  <class pattern="__gnu_cxx::__normal_iterator<const LArAutoCorrP*"/>
 
   <!-- LArCaliPulseParamsP -->
   <class name="LArCaliPulseParamsComplete" />
@@ -74,7 +74,7 @@
   <class name="std::vector<LArCaliPulseParamsP>"/>
   <class name="std::vector<std::pair<unsigned int, LArCaliPulseParamsP> >"/>
   <class name="std::vector<std::pair<unsigned int, std::vector<LArCaliPulseParamsP> > >"/>
-  <class pattern="*iterator<const*LArCaliPulseParamsP*"/>
+  <class pattern="__gnu_cxx::__normal_iterator<const LArCaliPulseParamsP*"/>
 
   <!-- LArDAC2uAP -->
   <class name="LArDAC2uAComplete" />
@@ -99,7 +99,7 @@
   <class name="std::vector<LArDAC2uAP>"/>
   <class name="std::vector<std::pair<unsigned int,LArDAC2uAP> >"/>
   <class name="std::vector<std::pair<unsigned int,std::vector<LArDAC2uAP> > >"/>
-  <class pattern="*iterator<const*LArDAC2uAP*"/>
+  <class pattern="__gnu_cxx::__normal_iterator<const LArDAC2uAP*"/>
 
 
   <!-- LArDetCellParamsP -->
@@ -124,7 +124,7 @@
   <class name="std::vector<LArDetCellParamsP>"/>
   <class name="std::vector<std::pair<unsigned int, LArDetCellParamsP> >"/>
   <class name="std::vector<std::pair<unsigned int, std::vector<LArDetCellParamsP> > >"/>
-  <class pattern="*iterator<const*LArDetCellParamsP*"/>
+  <class pattern="__gnu_cxx::__normal_iterator<const LArDetCellParamsP*"/>
 
   <!-- LArfSamplP -->
   <class name="LArfSamplComplete" />
@@ -149,7 +149,7 @@
   <class name="std::vector<LArfSamplP>"/>
   <class name="std::vector<std::pair<unsigned int, LArfSamplP> >"/>
   <class name="std::vector<std::pair<unsigned int, std::vector<LArfSamplP> > >"/>
-  <class pattern="*iterator<const*LArfSamplP*"/>
+  <class pattern="__gnu_cxx::__normal_iterator<const LArfSamplP*"/>
 
   <!-- LArH6OscillationP -->
   <class name="LArH6OscillationComplete" />
@@ -173,7 +173,7 @@
   <class name="std::vector<LArH6OscillationP>"/>
   <class name="std::vector<std::pair<unsigned int, LArH6OscillationP> >"/>
   <class name="std::vector<std::pair<unsigned int, std::vector<LArH6OscillationP> > >"/>
-  <class pattern="*iterator<const*LArH6OscillationP*"/>
+  <class pattern="__gnu_cxx::__normal_iterator<const LArH6OscillationP*"/>
 
   <!-- LArHVScaleCorrComplete -->
   <class name="LArHVScaleCorrComplete" />
@@ -198,7 +198,7 @@
   <class name="std::vector<LArSingleFloatP>"/>
   <class name="std::vector<std::pair<unsigned int, LArSingleFloatP> >"/>
   <class name="std::vector<std::pair<unsigned int, std::vector<LArSingleFloatP> > >"/>
-  <class pattern="*iterator<const*LArSingleFloatP*"/>
+  <class pattern="__gnu_cxx::__normal_iterator<const LArSingleFloatP*"/>
 
 
   <!-- LArMinBiasP -->
@@ -224,7 +224,7 @@
   <class name="std::vector<LArMinBiasP>"/>
   <class name="std::vector<std::pair<unsigned int, LArMinBiasP> >"/>
   <class name="std::vector<std::pair<unsigned int, std::vector<LArMinBiasP> > >"/>
-  <class pattern="*iterator<const*LArMinBiasP*"/>
+  <class pattern="__gnu_cxx::__normal_iterator<const LArMinBiasP*"/>
 
   <!-- LArMinBiasAverageP -->
   <class name="LArMinBiasAverageComplete" />
@@ -251,7 +251,7 @@
   <class name="std::vector<LArMinBiasAverageP>"/>
   <class name="std::vector<std::pair<unsigned int, LArMinBiasAverageP> >"/>
   <class name="std::vector<std::pair<unsigned int, std::vector<LArMinBiasAverageP> > >"/>
-  <class pattern="*iterator<const*LArMinBiasAverageP*"/>
+  <class pattern="__gnu_cxx::__normal_iterator<const LArMinBiasAverageP*"/>
 
   <!-- LArMphysOverMcalP -->
   <class name="LArMphysOverMcalComplete" />
@@ -277,7 +277,7 @@
   <class name="std::vector<LArMphysOverMcalP>"/>
   <class name="std::vector<std::pair<unsigned int, LArMphysOverMcalP> >"/>
   <class name="std::vector<std::pair<unsigned int, std::vector<LArMphysOverMcalP> > >"/>
-  <class pattern="*iterator<const*LArMphysOverMcalP*"/>
+  <class pattern="__gnu_cxx::__normal_iterator<const LArMphysOverMcalP*"/>
 
   <!-- LArNoiseP -->
   <class name="LArNoiseComplete" />
@@ -302,7 +302,7 @@
   <class name="std::vector<LArNoiseP>"/>
   <class name="std::vector<std::pair<unsigned int, LArNoiseP> >"/>
   <class name="std::vector<std::pair<unsigned int, std::vector<LArNoiseP> > >"/>
-  <class pattern="*iterator<const*LArNoiseP*"/>
+  <class pattern="__gnu_cxx::__normal_iterator<const LArNoiseP*"/>
 
 
   <!-- LAr2DWaveBase -->
@@ -332,7 +332,7 @@
   <class name="std::vector<LArOFCP>"/>
   <class name="std::vector<std::pair<unsigned int, LArOFCP> >"/>
   <class name="std::vector<std::pair<unsigned int, std::vector<LArOFCP> > >"/>
-  <class pattern="*iterator<const*LArOFCP*"/>
+  <class pattern="__gnu_cxx::__normal_iterator<const LArOFCP*"/>
   
 
   <!-- LArPedestalP -->
@@ -360,7 +360,7 @@
   <class name="std::vector<LArPedestalP>"/>
   <class name="std::vector<std::pair<unsigned int, LArPedestalP> >"/>
   <class name="std::vector<std::pair<unsigned int, std::vector<LArPedestalP> > >"/>
-  <class pattern="*iterator<const*LArPedestalP*"/> 
+  <class pattern="__gnu_cxx::__normal_iterator<const LArPedestalP*"/>
 
 
 
@@ -386,7 +386,7 @@
   <class name="std::vector<LArPhysCaliTdiffP>"/>
   <class name="std::vector<std::pair<unsigned int, LArPhysCaliTdiffP> >"/>
   <class name="std::vector<std::pair<unsigned int, std::vector<LArPhysCaliTdiffP> > >"/>
-  <class pattern="*iterator<const*LArPhysCaliTdiffP*"/>
+  <class pattern="__gnu_cxx::__normal_iterator<const LArPhysCaliTdiffP*"/>
 
   <!-- LArRampP -->
   <class name="LArRampCompleteBase" />
@@ -413,7 +413,7 @@
   <class name="std::vector<LArRampP>"/>
   <class name="std::vector<std::pair<unsigned int, LArRampP> >"/>
   <class name="std::vector<std::pair<unsigned int, std::vector<LArRampP> > >"/>
-  <class pattern="*iterator<const*LArRampP*"/>
+  <class pattern="__gnu_cxx::__normal_iterator<const LArRampP*"/>
 
 
   <!-- LAruA2MeVP -->
@@ -439,7 +439,7 @@
   <class name="std::vector<LAruA2MeVP>"/>
   <class name="std::vector<std::pair<unsigned int, LAruA2MeVP> >"/>
   <class name="std::vector<std::pair<unsigned int, std::vector<LAruA2MeVP> > >"/>
-  <class pattern="*iterator<const*LAruA2MeVP*"/>
+  <class pattern="__gnu_cxx::__normal_iterator<const LAruA2MeVP*"/>
 
 
   <!-- LArDPSThresholds -->
@@ -491,6 +491,7 @@
     <class pattern="*_Iter_base*"/>
     <class pattern="std::allocator*"/>
     <class pattern="*initializer_list*"/>
+    <class pattern="*iterator_traits*"/>
 
   </exclusion>
 </lcgdict>
diff --git a/LArCalorimeter/LArRawConditions/LArRawConditions/selection2.xml b/LArCalorimeter/LArRawConditions/LArRawConditions/selection2.xml
index 927c0b17bd5529487fba36a2a8f3ec4f7785e1bb..96e5a7e17da3359e939ffa583a000a53bd5313b3 100644
--- a/LArCalorimeter/LArRawConditions/LArRawConditions/selection2.xml
+++ b/LArCalorimeter/LArRawConditions/LArRawConditions/selection2.xml
@@ -35,9 +35,10 @@
   <class name="std::vector<LArShapeP>"/>
   <class name="std::vector<std::pair<unsigned int, LArShapeP> >"/>
   <class name="std::vector<std::pair<unsigned int, std::vector<LArShapeP> > >"/>
-  <class pattern="*iterator<const*LArShapeP*"/>
+  <class pattern="__gnu_cxx::__normal_iterator<const LArShapeP*"/>
 
   <!-- LArTdriftP -->
+
   <class name="LArTdriftComplete" />
   <!-- picked up through iterator pattern below. -->
   <!-- <class name="LArTdriftP" /> -->
@@ -59,7 +60,7 @@
   <class name="std::vector<LArTdriftP>"/>
   <class name="std::vector<std::pair<unsigned int, LArTdriftP> >"/>
   <class name="std::vector<std::pair<unsigned int, std::vector<LArTdriftP> > >"/>
-  <class pattern="*iterator<const*LArTdriftP*"/>
+  <class pattern="__gnu_cxx::__normal_iterator<const LArTdriftP*"/>
 
 
   <!-- LArRinjP -->
@@ -84,7 +85,7 @@
   <class name="std::vector<LArRinjP>"/>
   <class name="std::vector<std::pair<unsigned int, LArRinjP> >"/>
   <class name="std::vector<std::pair<unsigned int, std::vector<LArRinjP> > >"/>
-  <class pattern="*iterator<const*LArRinjP*"/>
+  <class pattern="__gnu_cxx::__normal_iterator<const LArRinjP*"/>
 
   <!-- LArCableLengthP -->
   <class name="LArCableLengthComplete" />
@@ -108,7 +109,7 @@
   <class name="std::vector<LArCableLengthP>"/>
   <class name="std::vector<std::pair<unsigned int, LArCableLengthP> >"/>
   <class name="std::vector<std::pair<unsigned int, std::vector<LArCableLengthP> > >"/>
-  <class pattern="*iterator<const*LArCableLengthP*"/>
+  <class pattern="__gnu_cxx::__normal_iterator<const LArCableLengthP*"/>
 
   <!-- LArCableAttenuationP -->
   <class name="LArCableAttenuationComplete" />
@@ -132,7 +133,7 @@
   <class name="std::vector<LArCableAttenuationP>"/>
   <class name="std::vector<std::pair<unsigned int, LArCableAttenuationP> >"/>
   <class name="std::vector<std::pair<unsigned int, std::vector<LArCableAttenuationP> > >"/>
-  <class pattern="*iterator<const*LArCableAttenuationP*"/>
+  <class pattern="__gnu_cxx::__normal_iterator<const LArCableAttenuationP*"/>
 
   <!-- LArTshaperP -->
   <class name="LArTshaperComplete" />
@@ -156,7 +157,7 @@
   <class name="std::vector<LArTshaperP>"/>
   <class name="std::vector<std::pair<unsigned int, LArTshaperP> >"/>
   <class name="std::vector<std::pair<unsigned int, std::vector<LArTshaperP> > >"/>
-  <class pattern="*iterator<const*LArTshaperP*"/>
+  <class pattern="__gnu_cxx::__normal_iterator<const LArTshaperP*"/>
 
   <!-- LArOFCBinP -->
   <class name="LArOFCBinComplete" />
@@ -180,7 +181,7 @@
   <class name="std::vector<LArOFCBinP>"/>
   <class name="std::vector<std::pair<unsigned int, LArOFCBinP> >"/>
   <class name="std::vector<std::pair<unsigned int, std::vector<LArOFCBinP> > >"/>
-  <class pattern="*iterator<const*LArOFCBinP*"/>
+  <class pattern="__gnu_cxx::__normal_iterator<const LArOFCBinP*"/>
   
   <!-- LArEMEC_CphiP -->
   <class name="LArEMEC_CphiComplete" />
@@ -204,7 +205,7 @@
   <class name="std::vector<LArEMEC_CphiP>"/>
   <class name="std::vector<std::pair<unsigned int, LArEMEC_CphiP> >"/>
   <class name="std::vector<std::pair<unsigned int, std::vector<LArEMEC_CphiP> > >"/>
-  <class pattern="*iterator<const*LArEMEC_CphiP*"/>
+  <class pattern="__gnu_cxx::__normal_iterator<const LArEMEC_CphiP*"/>
   
   <!-- LArEMEC_HValphaP -->
   <class name="LArEMEC_HValphaComplete" />
@@ -228,7 +229,7 @@
   <class name="std::vector<LArEMEC_HValphaP>"/>
   <class name="std::vector<std::pair<unsigned int, LArEMEC_HValphaP> >"/>
   <class name="std::vector<std::pair<unsigned int, std::vector<LArEMEC_HValphaP> > >"/>
-  <class pattern="*iterator<const*LArEMEC_HValphaP*"/>
+  <class pattern="__gnu_cxx::__normal_iterator<const LArEMEC_HValphaP*"/>
 
   <!-- LArEMEC_HVbetaP -->
   <class name="LArEMEC_HVbetaComplete" />
@@ -252,7 +253,7 @@
   <class name="std::vector<LArEMEC_HVbetaP>"/>
   <class name="std::vector<std::pair<unsigned int, LArEMEC_HVbetaP> >"/>
   <class name="std::vector<std::pair<unsigned int, std::vector<LArEMEC_HVbetaP> > >"/>
-  <class pattern="*iterator<const*LArEMEC_HVbetaP*"/>
+  <class pattern="__gnu_cxx::__normal_iterator<const LArEMEC_HVbetaP*"/>
 
 
   <!-- LArCaliWave -->
@@ -280,7 +281,7 @@
   <class name="std::vector<LArCaliWaveVec>"/>
   <class name="std::vector<std::pair<unsigned int, LArCaliWaveVec> >"/>
   <class name="std::vector<std::pair<unsigned int, std::vector<LArCaliWaveVec> > >"/>
-  <class pattern="*iterator<const*LArCaliWaveVec*"/>
+  <class pattern="__gnu_cxx::__normal_iterator<const LArCaliWaveVec*"/>
 
   <!-- LArPhysWave -->
   <!-- picked up through iterator pattern below. -->
@@ -305,7 +306,7 @@
   <class name="std::vector<LArPhysWave>"/>
   <class name="std::vector<std::pair<unsigned int, LArPhysWave> >"/>
   <class name="std::vector<std::pair<unsigned int, std::vector<LArPhysWave> > >"/>
-  <class pattern="*iterator<const*LArPhysWave*"/>
+  <class pattern="__gnu_cxx::__normal_iterator<const LArPhysWave*"/>
 
 
   <!-- Other 'old' waves -->
@@ -398,6 +399,7 @@
     <class pattern="*_Iter_base*"/>
     <class pattern="std::allocator*"/>
     <class pattern="*initializer_list*"/>
+    <class pattern="*iterator_traits*"/>
 
   </exclusion>