Merge pull request #7060 from wmtan/FixBuildErrors

Fix build errors caused by carryovers
cms-sw · Jan 7, 2015 · 15b1360 · 15b1360
2 parents db59a24 + d05aa88
commit 15b1360
Show file tree

Hide file tree

Showing 9 changed files with 62 additions and 52 deletions.
diff --git a/DataFormats/Candidate/src/classes_def.xml b/DataFormats/Candidate/src/classes_def.xml
@@ -47,13 +47,22 @@
    <version ClassVersion="11" checksum="1985736233"/>
    <version ClassVersion="10" checksum="2953566340"/>
   </class>
-  <class name="reco::VertexCompositePtrCandidate" ClassVersion="12">
-   <version ClassVersion="12" checksum="2781469517"/>
+
+  <class name="reco::LeafRefCandidateT" ClassVersion="13">
+    <version ClassVersion="13" checksum="2417932556"/>
+    <version ClassVersion="11" checksum="2417932556"/>
+    <version ClassVersion="10" checksum="2404784677"/>
+   </class>
+
+  <class name="reco::VertexCompositePtrCandidate" ClassVersion="13">
+   <version ClassVersion="13" checksum="3584734005"/>
+   <version ClassVersion="12" checksum="3253990857"/>
    <version ClassVersion="11" checksum="2070976353"/>
    <version ClassVersion="10" checksum="955269040"/>
   </class>
-  <class name="reco::VertexCompositeCandidate" ClassVersion="12">
-   <version ClassVersion="12" checksum="2839752627"/>
+  <class name="reco::VertexCompositeCandidate" ClassVersion="13">
+   <version ClassVersion="13" checksum="1561694123"/>
+   <version ClassVersion="12" checksum="1204062111"/>
    <version ClassVersion="11" checksum="2801258535"/>
    <version ClassVersion="10" checksum="4177206274"/>
   </class>

diff --git a/DataFormats/Candidate/test/testParticle.cc b/DataFormats/Candidate/test/testParticle.cc
@@ -2,7 +2,6 @@
 #include "DataFormats/Candidate/interface/Particle.h"
 #include "TBufferFile.h"
 #include "TClass.h"
-#include "Cintex/Cintex.h"
 #include <iostream>
 
 class testParticle : public CppUnit::TestFixture {
@@ -16,11 +15,6 @@ class testParticle : public CppUnit::TestFixture {
   CPPUNIT_TEST_SUITE_END();
 public:
   void setUp() {
- static bool cintexInitialized = false;
-    if (!cintexInitialized) {
-      cintexInitialized = true;
-      ROOT::Cintex::Cintex::Enable();
-   } 
   }
   void tearDown() {}
   void checkXYZ();

diff --git a/DataFormats/EgammaCandidates/src/classes_def.xml b/DataFormats/EgammaCandidates/src/classes_def.xml
@@ -47,8 +47,7 @@
    <version ClassVersion="10" checksum="3308689624"/>
    <version ClassVersion="11" checksum="3649971983"/>
   </class>
-  <class name="reco::Photon::PflowIsolationVariables"  ClassVersion="13">
-   <version ClassVersion="13" checksum="114160170"/>
+  <class name="reco::Photon::PflowIsolationVariables"  ClassVersion="12">
    <version ClassVersion="11" checksum="3200292660"/>
    <version ClassVersion="12" checksum="114160170"/>
   </class>
@@ -174,8 +173,7 @@
   <class name="reco::GsfElectron::ChargeInfo" ClassVersion="10">
    <version ClassVersion="10" checksum="1415326811"/>
   </class>
-  <class name="reco::GsfElectron::PflowIsolationVariables" ClassVersion="12">
-   <version ClassVersion="12" checksum="2389048798"/>
+  <class name="reco::GsfElectron::PflowIsolationVariables" ClassVersion="11">
    <version ClassVersion="11" checksum="2389048798"/>
    <version ClassVersion="10" checksum="4270399196"/>
   <ioread sourceClass="reco::GsfElectron::PflowIsolationVariables" version="[1-10]" source="float chargedHadronIso" targetClass="reco::GsfElectron::PflowIsolationVariables" target="sumChargedHadronPt">
@@ -221,8 +219,9 @@
   <class name="reco::GsfElectron::PixelMatchVariables" ClassVersion="2">
     <version ClassVersion="2" checksum="3522539867"/>
   </class>
-  <class name="reco::GsfElectron" ClassVersion="18">
-   <version ClassVersion="18" checksum="2612939104"/>
+  <class name="reco::GsfElectron" ClassVersion="19">
+   <version ClassVersion="19" checksum="1682285704"/>
+   <version ClassVersion="18" checksum="2072747263"/>
    <version ClassVersion="17" checksum="1861965703"/>
    <version ClassVersion="16" checksum="1022265405"/>
    <version ClassVersion="15" checksum="515498629"/>

diff --git a/DataFormats/L1Trigger/src/classes_def.xml b/DataFormats/L1Trigger/src/classes_def.xml
@@ -23,8 +23,9 @@
   <class name="l1t::EGammaBxCollection"/>
   <class name="edm::Wrapper<l1t::EGammaBxCollection>"/>
 
-  <class name="l1t::EtSum" ClassVersion="12">
-   <version ClassVersion="12" checksum="1387244095"/>
+  <class name="l1t::EtSum" ClassVersion="13">
+   <version ClassVersion="13" checksum="914893879"/>
+   <version ClassVersion="12" checksum="2853072620"/>
    <version ClassVersion="11" checksum="2043464580"/>
    <version ClassVersion="10" checksum="3389025278"/>
   </class>
@@ -47,21 +48,24 @@
   <class name="l1t::MuonBxCollection"/>
   <class name="edm::Wrapper<l1t::MuonBxCollection>"/>
 
-  <class name="l1t::CaloSpare" ClassVersion="12">
-   <version ClassVersion="12" checksum="2469172893"/>
+  <class name="l1t::CaloSpare" ClassVersion="13">
+   <version ClassVersion="13" checksum="50826133"/>
+   <version ClassVersion="12" checksum="3118488206"/>
    <version ClassVersion="11" checksum="2308880166"/>
    <version ClassVersion="10" checksum="3477497140"/>
   </class>
   <class name="l1t::CaloSpareBxCollection"/>
   <class name="edm::Wrapper<l1t::CaloSpareBxCollection>"/>
 
-  <class name="l1extra::L1EmParticle" ClassVersion="12">
-   <version ClassVersion="12" checksum="2775580814"/>
+  <class name="l1extra::L1EmParticle" ClassVersion="13">
+   <version ClassVersion="13" checksum="3236372598"/>
+   <version ClassVersion="12" checksum="3931086678"/>
    <version ClassVersion="11" checksum="711885342"/>
    <version ClassVersion="10" checksum="2019457791"/>
   </class>
-  <class name="l1extra::L1JetParticle" ClassVersion="12">
-   <version ClassVersion="12" checksum="1518457073"/>
+  <class name="l1extra::L1JetParticle" ClassVersion="13">
+   <version ClassVersion="13" checksum="2428218521"/>
+   <version ClassVersion="12" checksum="4036782287"/>
    <version ClassVersion="11" checksum="979511831"/>
    <version ClassVersion="10" checksum="2992828146"/>
   </class>
@@ -70,8 +74,9 @@
    <version ClassVersion="11" checksum="3788189108"/>
    <version ClassVersion="10" checksum="404862417"/>
   </class>
-  <class name="l1extra::L1EtMissParticle" ClassVersion="12">
-   <version ClassVersion="12" checksum="3758765977"/>
+  <class name="l1extra::L1EtMissParticle" ClassVersion="13">
+   <version ClassVersion="13" checksum="2570765761"/>
+   <version ClassVersion="12" checksum="3702781837"/>
    <version ClassVersion="11" checksum="2391271061"/>
    <version ClassVersion="10" checksum="256436604"/>
   </class>
@@ -153,11 +158,5 @@
   <class name="std::vector<L1TriggerError>"/>
   <class name="edm::Wrapper<std::vector<L1TriggerError> >"/>
 
-  <class name="BXVector<l1t::CaloSpare>"/>
-  <class name="BXVector<l1t::EGamma>"/>
-  <class name="BXVector<l1t::EtSum>"/>
-  <class name="BXVector<l1t::Jet>"/>
-  <class name="BXVector<l1t::Muon>"/>
-  <class name="BXVector<l1t::Tau>"/>
 
 </lcgdict>
diff --git a/DataFormats/MuonReco/src/classes_def.xml b/DataFormats/MuonReco/src/classes_def.xml
@@ -1,6 +1,7 @@
 <lcgdict>
-  <class name="reco::Muon" ClassVersion="16">
-   <version ClassVersion="16" checksum="2804328230"/>
+  <class name="reco::Muon" ClassVersion="17">
+   <version ClassVersion="17" checksum="2296096670"/>
+   <version ClassVersion="16" checksum="1808419014"/>
    <version ClassVersion="15" checksum="4145317518"/>
    <version ClassVersion="11" checksum="199341143"/>
    <version ClassVersion="12" checksum="1157850969"/>
@@ -55,8 +56,7 @@
   <class name="std::vector<reco::MuonSegmentMatch>"/>
   <class name="std::vector<reco::MuonRPCHitMatch>"/>
 
-  <class name="reco::MuonIsolation" ClassVersion="11">
-   <version ClassVersion="11" checksum="2078425999"/>
+  <class name="reco::MuonIsolation" ClassVersion="10">
    <version ClassVersion="10" checksum="2078425999"/>
   </class>
   <class name="reco::MuonPFIsolation" ClassVersion="15">
@@ -66,7 +66,6 @@
   </class>
 
   <class name="reco::Muon::MuonTrackRefMap"/>
-  <class name="std::pair<MuonTrackType, reco::TrackRef> >" />
 
   <class name="reco::CaloMuon" ClassVersion="10">
    <version ClassVersion="10" checksum="3458815810"/>

diff --git a/DataFormats/ParticleFlowCandidate/src/classes_def.xml b/DataFormats/ParticleFlowCandidate/src/classes_def.xml
@@ -1,7 +1,8 @@
 <lcgdict>
 
-   <class name="reco::PFCandidate" ClassVersion="15">
-    <version ClassVersion="15" checksum="3097553601"/>
+   <class name="reco::PFCandidate" ClassVersion="17">
+    <version ClassVersion="17" checksum="3126170233"/>
+    <version ClassVersion="16" checksum="3060382005"/>
     <version ClassVersion="15" checksum="1136968957"/>
     <version ClassVersion="10" checksum="536762407"/>
     <version ClassVersion="11" checksum="2503588164"/>
@@ -44,8 +45,9 @@
   <class name="edm::ValueMap<edm::Ptr<reco::PFCandidate> >"/>
   <class name="edm::reftobase::RefVectorHolder<reco::PFCandidateRefVector >"/>
 
-  <class name="reco::IsolatedPFCandidate"  ClassVersion="12">
-   <version ClassVersion="12" checksum="2136568226"/>
+  <class name="reco::IsolatedPFCandidate"  ClassVersion="13">
+   <version ClassVersion="13" checksum="1855164250"/>
+   <version ClassVersion="12" checksum="2650360086"/>
    <version ClassVersion="11" checksum="696008414"/>
    <version ClassVersion="10" checksum="1426765407"/>
   </class>
@@ -56,8 +58,9 @@
   <class name="reco::IsolatedPFCandidateRefVector"/>
   <class name="reco::IsolatedPFCandidatePtr"/>
 
-  <class name="reco::PileUpPFCandidate"  ClassVersion="12">
-   <version ClassVersion="12" checksum="3754844159"/>
+  <class name="reco::PileUpPFCandidate"  ClassVersion="13">
+   <version ClassVersion="13" checksum="1734488695"/>
+   <version ClassVersion="12" checksum="2377890195"/>
    <version ClassVersion="11" checksum="1422984859"/>
    <version ClassVersion="10" checksum="1986419188"/>
   </class>

diff --git a/DataFormats/PatCandidates/src/classes_def_objects.xml b/DataFormats/PatCandidates/src/classes_def_objects.xml
@@ -16,7 +16,8 @@
   <class name="pat::Lepton<reco::BaseTau>" />
 
   <!-- PAT Objects, and embedded data  -->
-  <class name="pat::Electron"  ClassVersion="27">
+  <class name="pat::Electron"  ClassVersion="28">
+   <version ClassVersion="28" checksum="2518240031"/>
    <version ClassVersion="27" checksum="2628480167"/>
    <field name="superClusterRelinked_" transient="true"/>
    <version ClassVersion="26" checksum="2045819644"/>
@@ -40,7 +41,8 @@
     <![CDATA[superClusterRelinked_.reset();]]>
   </ioread>
 
-  <class name="pat::Muon"  ClassVersion="15">
+  <class name="pat::Muon"  ClassVersion="16">
+   <version ClassVersion="16" checksum="2674665735"/>
    <version ClassVersion="15" checksum="2088272079"/>
    <version ClassVersion="14" checksum="132269943"/>
    <version ClassVersion="13" checksum="2943499125"/>
@@ -138,7 +140,8 @@
     <![CDATA[superClusterRelinked_.reset();]]>
   </ioread>
 
-  <class name="pat::Jet"  ClassVersion="14">
+  <class name="pat::Jet"  ClassVersion="15">
+   <version ClassVersion="15" checksum="1826981639"/>
    <version ClassVersion="14" checksum="766989023"/>
    <version ClassVersion="13" checksum="130552029"/>
    <field name="caloTowersTemp_" transient="true"/>
@@ -177,7 +180,8 @@
    <version ClassVersion="11" checksum="3492108938"/>
    <version ClassVersion="10" checksum="417284221"/>
   </class>
-  <class name="pat::PFParticle"  ClassVersion="12">
+  <class name="pat::PFParticle"  ClassVersion="13">
+   <version ClassVersion="13" checksum="223824921"/>
    <version ClassVersion="12" checksum="2881263841"/>
    <version ClassVersion="11" checksum="2923110109"/>
    <version ClassVersion="10" checksum="2240381542"/>

diff --git a/DataFormats/RecoCandidate/src/classes_def.xml b/DataFormats/RecoCandidate/src/classes_def.xml
@@ -139,7 +139,6 @@
    <version ClassVersion="10" checksum="4098085496"/>
   </class>
   <class name="std::multimap<reco::isodeposit::Direction::Distance,float>"/>
-  <class name="std::pair<reco::isodeposit::Direction::Distance,float>"/>
 
   <class name="reco::IsoDepositMap"/>
   <class name="edm::ValueMap<reco::IsoDeposit>::const_iterator">

diff --git a/DataFormats/TauReco/src/classes_def_2.xml b/DataFormats/TauReco/src/classes_def_2.xml
@@ -1,6 +1,7 @@
 <lcgdict>
 
-  <class name="reco::PFTau" ClassVersion="17">
+  <class name="reco::PFTau" ClassVersion="18">
+   <version ClassVersion="18" checksum="1318776182"/>
    <version ClassVersion="17" checksum="2612600958"/>
     <version ClassVersion="16" checksum="2695990650"/>
     <version ClassVersion="15" checksum="4105994460"/>
@@ -206,7 +207,8 @@ for(auto const& ref : onfile.selectedIsolationPFGammaCands_) {
 <!-- </ioread> -->
 
 
-  <class name="reco::PFTauDecayMode" ClassVersion="12">
+  <class name="reco::PFTauDecayMode" ClassVersion="13">
+   <version ClassVersion="13" checksum="3507751092"/>
    <version ClassVersion="12" checksum="1678823548"/>
    <version ClassVersion="11" checksum="3414615810"/>
    <version ClassVersion="10" checksum="2108215737"/>
@@ -222,7 +224,8 @@ for(auto const& ref : onfile.selectedIsolationPFGammaCands_) {
   <class name="edm::Wrapper<edm::Association<std::vector<reco::PFTauDecayMode> > >"/>
   <class name="edm::Wrapper<edm::Association<std::vector<reco::PFTau> > >"/>
 
-  <class name="reco::RecoTauPiZero" ClassVersion="12">
+  <class name="reco::RecoTauPiZero" ClassVersion="13">
+   <version ClassVersion="13" checksum="3687187514"/>
    <version ClassVersion="12" checksum="263073298"/>
    <version ClassVersion="11" checksum="2458276705"/>
    <version ClassVersion="10" checksum="465425628"/>
@@ -235,7 +238,8 @@ for(auto const& ref : onfile.selectedIsolationPFGammaCands_) {
   <class name="edm::RefVector<std::vector<reco::RecoTauPiZero>,reco::RecoTauPiZero,edm::refhelper::FindUsingAdvance<std::vector<reco::RecoTauPiZero>,reco::RecoTauPiZero> >"/>
   <class name="edm::reftobase::Holder<reco::CompositePtrCandidate, edm::Ref<std::vector<reco::RecoTauPiZero>,reco::RecoTauPiZero,edm::refhelper::FindUsingAdvance<std::vector<reco::RecoTauPiZero>,reco::RecoTauPiZero> > >" />
 
-  <class name="reco::PFRecoTauChargedHadron" ClassVersion="13">
+  <class name="reco::PFRecoTauChargedHadron" ClassVersion="14">
+   <version ClassVersion="14" checksum="3665832588"/>
    <version ClassVersion="13" checksum="2433815140"/>
    <version ClassVersion="12" checksum="2480143236" />
    <version ClassVersion="11" checksum="858406271" />