Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Move to ROOT pre-6.06 (almost final) #12713

Merged
merged 4 commits into from Dec 9, 2015
Merged

Move to ROOT pre-6.06 (almost final) #12713

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
2f3a42e
New checksum for edm::StreamedProduct class needed for ROOT 6.04.00
May 27, 2015
3e0025f
Remove std::iterator selection rules
Jun 11, 2015
59892be
Remove duplicate classes
Jun 15, 2015
27ceb93
Remove *TSchemaHelper* classes from the dictionary
Nov 6, 2015
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
8 changes: 0 additions & 8 deletions DataFormats/PatCandidates/src/classes_def_trigger.xml
View file
Open in desktop
Expand Up @@ -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>
Expand Down
4 changes: 0 additions & 4 deletions DataFormats/Provenance/src/classes_def.xml
View file
Open in desktop
Expand Up @@ -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"/>
Expand Down
9 changes: 0 additions & 9 deletions DataFormats/StdDictionaries/src/classes_def_pair.xml
View file
Open in desktop
@@ -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> >"/>
Expand All @@ -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> >"/>
Expand All @@ -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> >"/>
Expand All @@ -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> >"/>
Expand Down
3 changes: 2 additions & 1 deletion DataFormats/Streamer/src/classes_def.xml
View file
Open in desktop
@@ -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"/>
Expand Down