Merge pull request #12713 from cms-sw/move-to-root-pre-6.06

Move to ROOT pre-6.06 (almost final)
cms-sw · Dec 9, 2015 · 748bf81 · 748bf81
2 parents 8792345 + 27ceb93
commit 748bf81
Show file tree

Hide file tree

Showing 4 changed files with 2 additions and 22 deletions.
diff --git a/DataFormats/PatCandidates/src/classes_def_trigger.xml b/DataFormats/PatCandidates/src/classes_def_trigger.xml
@@ -110,14 +110,6 @@
     <![CDATA[triggerNames_ = 0; ]]>
   </ioread>
   <class name="edm::Wrapper&lt;pat::PackedTriggerPrescales&gt;" />
-
-
-  <class pattern="std::iterator&lt;std::random_access_iterator_tag,edm::Ref&lt;std::vector&lt;pat::TriggerPath&gt;,pat::TriggerPath,edm::refhelper::FindUsingAdvance&lt;std::vector&lt;pat::TriggerPath&gt;,pat::TriggerPath&gt; &gt;,*,edm::Ref&lt;std::vector&lt;pat::TriggerPath&gt;,pat::TriggerPath,edm::refhelper::FindUsingAdvance&lt;std::vector&lt;pat::TriggerPath&gt;,pat::TriggerPath&gt; &gt;*,edm::Ref&lt;std::vector&lt;pat::TriggerPath&gt;,pat::TriggerPath,edm::refhelper::FindUsingAdvance&lt;std::vector&lt;pat::TriggerPath&gt;,pat::TriggerPath&gt; &gt;&amp;&gt;"/>
-  <class pattern="std::iterator&lt;std::random_access_iterator_tag,edm::Ref&lt;std::vector&lt;pat::TriggerObjectStandAlone&gt;,pat::TriggerObjectStandAlone,edm::refhelper::FindUsingAdvance&lt;std::vector&lt;pat::TriggerObjectStandAlone&gt;,pat::TriggerObjectStandAlone&gt; &gt;,*,edm::Ref&lt;std::vector&lt;pat::TriggerObjectStandAlone&gt;,pat::TriggerObjectStandAlone,edm::refhelper::FindUsingAdvance&lt;std::vector&lt;pat::TriggerObjectStandAlone&gt;,pat::TriggerObjectStandAlone&gt; &gt;*,edm::Ref&lt;std::vector&lt;pat::TriggerObjectStandAlone&gt;,pat::TriggerObjectStandAlone,edm::refhelper::FindUsingAdvance&lt;std::vector&lt;pat::TriggerObjectStandAlone&gt;,pat::TriggerObjectStandAlone&gt; &gt;&amp;&gt;"/>
-  <class pattern="std::iterator&lt;std::random_access_iterator_tag,edm::Ref&lt;std::vector&lt;pat::TriggerFilter&gt;,pat::TriggerFilter,edm::refhelper::FindUsingAdvance&lt;std::vector&lt;pat::TriggerFilter&gt;,pat::TriggerFilter&gt; &gt;,*,edm::Ref&lt;std::vector&lt;pat::TriggerFilter&gt;,pat::TriggerFilter,edm::refhelper::FindUsingAdvance&lt;std::vector&lt;pat::TriggerFilter&gt;,pat::TriggerFilter&gt; &gt;*,edm::Ref&lt;std::vector&lt;pat::TriggerFilter&gt;,pat::TriggerFilter,edm::refhelper::FindUsingAdvance&lt;std::vector&lt;pat::TriggerFilter&gt;,pat::TriggerFilter&gt; &gt;&amp;&gt;"/>
-  <class pattern="std::iterator&lt;std::random_access_iterator_tag,edm::Ref&lt;std::vector&lt;pat::TriggerObject&gt;,pat::TriggerObject,edm::refhelper::FindUsingAdvance&lt;std::vector&lt;pat::TriggerObject&gt;,pat::TriggerObject&gt; &gt;,*,edm::Ref&lt;std::vector&lt;pat::TriggerObject&gt;,pat::TriggerObject,edm::refhelper::FindUsingAdvance&lt;std::vector&lt;pat::TriggerObject&gt;,pat::TriggerObject&gt; &gt;*,edm::Ref&lt;std::vector&lt;pat::TriggerObject&gt;,pat::TriggerObject,edm::refhelper::FindUsingAdvance&lt;std::vector&lt;pat::TriggerObject&gt;,pat::TriggerObject&gt; &gt;&amp;&gt;"/>
-  <class pattern="std::iterator&lt;std::random_access_iterator_tag,edm::Ref&lt;std::vector&lt;pat::TriggerCondition&gt;,pat::TriggerCondition,edm::refhelper::FindUsingAdvance&lt;std::vector&lt;pat::TriggerCondition&gt;,pat::TriggerCondition&gt; &gt;,*,edm::Ref&lt;std::vector&lt;pat::TriggerCondition&gt;,pat::TriggerCondition,edm::refhelper::FindUsingAdvance&lt;std::vector&lt;pat::TriggerCondition&gt;,pat::TriggerCondition&gt; &gt;*,edm::Ref&lt;std::vector&lt;pat::TriggerCondition&gt;,pat::TriggerCondition,edm::refhelper::FindUsingAdvance&lt;std::vector&lt;pat::TriggerCondition&gt;,pat::TriggerCondition&gt; &gt;&amp;&gt;"/>
-  <class pattern="std::iterator&lt;std::random_access_iterator_tag,edm::Ref&lt;std::vector&lt;pat::TriggerAlgorithm&gt;,pat::TriggerAlgorithm,edm::refhelper::FindUsingAdvance&lt;std::vector&lt;pat::TriggerAlgorithm&gt;,pat::TriggerAlgorithm&gt; &gt;,*,edm::Ref&lt;std::vector&lt;pat::TriggerAlgorithm&gt;,pat::TriggerAlgorithm,edm::refhelper::FindUsingAdvance&lt;std::vector&lt;pat::TriggerAlgorithm&gt;,pat::TriggerAlgorithm&gt; &gt;*,edm::Ref&lt;std::vector&lt;pat::TriggerAlgorithm&gt;,pat::TriggerAlgorithm,edm::refhelper::FindUsingAdvance&lt;std::vector&lt;pat::TriggerAlgorithm&gt;,pat::TriggerAlgorithm&gt; &gt;&amp;&gt;"/>
   </selection>
  <exclusion>
  </exclusion>

diff --git a/DataFormats/Provenance/src/classes_def.xml b/DataFormats/Provenance/src/classes_def.xml
@@ -192,10 +192,6 @@
   <version ClassVersion="10" checksum="2903606143"/>
  </class>
 
- <class name="ROOT::TSchemaHelper" ClassVersion="10">
-  <version ClassVersion="10" checksum="3064700282"/>
- </class>
- <class name="std::vector<ROOT::TSchemaHelper>"/>
  <class name="std::vector<TFormula*>"/>
 
  <class name="edm::ThinnedAssociationBranches"/>

diff --git a/DataFormats/StdDictionaries/src/classes_def_pair.xml b/DataFormats/StdDictionaries/src/classes_def_pair.xml
@@ -1,5 +1,4 @@
 <lcgdict>
- <class name="std::pair<const int,int>"/>
  <class name="std::pair<const int,std::pair<double,double> >"/>
  <class name="std::pair<const int,std::pair<unsigned int,unsigned int> >"/>
  <class name="std::pair<const int,std::pair<unsigned long,unsigned long> >"/>
@@ -8,7 +7,6 @@
  <class name="std::pair<const short,short>"/>
  <class name="std::pair<const short,unsigned int>"/>
  <class name="std::pair<const std::basic_string<char>,bool>"/>
- <class name="std::pair<const std::basic_string<char>,int>"/>
  <class name="std::pair<const std::basic_string<char>,std::basic_string<char> >"/>
  <class name="std::pair<const std::basic_string<char>,std::map<std::basic_string<char>,std::basic_string<char> > >"/>
  <class name="std::pair<const std::basic_string<char>,std::pair<unsigned int,unsigned int> >"/>
@@ -34,11 +32,7 @@
  <class name="std::pair<const unsigned short,float>"/>
  <class name="std::pair<const unsigned short,std::vector<unsigned short> >"/>
  <class name="std::pair<const unsigned short,unsigned short>"/>
- <class name="std::pair<double,double>"/>
  <class name="std::pair<double,std::vector<double> >"/>
- <class name="std::pair<float,float>"/>
- <class name="std::pair<int,double>"/>
- <class name="std::pair<int,int>"/>
  <class name="std::pair<int,std::pair<double,double> >"/>
  <class name="std::pair<int,std::pair<unsigned int,unsigned int> >"/>
  <class name="std::pair<int,std::pair<unsigned long,unsigned long> >"/>
@@ -47,9 +41,6 @@
  <class name="std::pair<short,std::vector<short> >"/>
  <class name="std::pair<short,unsigned int>"/>
  <class name="std::pair<std::basic_string<char>,bool>"/>
- <class name="std::pair<std::basic_string<char>,double>"/>
- <class name="std::pair<std::basic_string<char>,float>"/>
- <class name="std::pair<std::basic_string<char>,int>"/>
  <class name="std::pair<std::basic_string<char>,std::basic_string<char> >"/>
  <class name="std::pair<std::basic_string<char>,std::map<std::basic_string<char>,std::basic_string<char> > >"/>
  <class name="std::pair<std::basic_string<char>,std::pair<unsigned int,unsigned int> >"/>

diff --git a/DataFormats/Streamer/src/classes_def.xml b/DataFormats/Streamer/src/classes_def.xml
@@ -1,6 +1,7 @@
 
 <lcgdict>
- <class name="edm::StreamedProduct" ClassVersion="12">
+ <class name="edm::StreamedProduct" ClassVersion="13">
+  <version ClassVersion="13" checksum="87489871"/>
   <version ClassVersion="12" checksum="855998814"/>
   <version ClassVersion="10" checksum="512531612"/>
   <version ClassVersion="11" checksum="1146084488"/>