[EVO] Moved data products in reco:: namespace to reco::io_v1

AnalysisDataFormats/SUSYBSMObjects/src/classes_def.xml

@@ -1,6 +1,6 @@
 <lcgdict>
    <class name="susybsm::HSCParticle" ClassVersion="3">
-    <version ClassVersion="3" checksum="2568887826"/>
+    <version ClassVersion="3" checksum="3189720800"/>
    </class>
    <class name="susybsm::RPCBetaMeasurement" ClassVersion="10">
     <version ClassVersion="10" checksum="2621605308"/>

AnalysisDataFormats/TopObjects/src/classes_def.xml

@@ -1,38 +1,31 @@
 <lcgdict>
-  <class name="TtGenEvent"  ClassVersion="12">
-   <version ClassVersion="12" checksum="3953108735"/>
-   <version ClassVersion="11" checksum="3979818069"/>
-   <version ClassVersion="10" checksum="2353612425"/>
+  <class name="TtGenEvent"  ClassVersion="3">
+   <version ClassVersion="3" checksum="2709360007"/>
   </class>
-  <class name="StGenEvent"  ClassVersion="11">
-   <version ClassVersion="11" checksum="712808804"/>
-   <version ClassVersion="10" checksum="3161795320"/>
+  <class name="StGenEvent"  ClassVersion="3">
+   <version ClassVersion="3" checksum="816344636"/>
   </class>
-  <class name="TopGenEvent"  ClassVersion="10">
-   <version ClassVersion="10" checksum="4112324732"/>
+  <class name="TopGenEvent"  ClassVersion="3">
+   <version ClassVersion="3" checksum="4215860564"/>
   </class>
-  <class name="TtEvent"  ClassVersion="11">
-   <version ClassVersion="11" checksum="1688727696"/>
+  <class name="TtEvent"  ClassVersion="3">
+   <version ClassVersion="3" checksum="67438550"/>
   </class>
-  <class name="TtFullLeptonicEvent"  ClassVersion="11">
-   <version ClassVersion="11" checksum="4030394490"/>
-   <version ClassVersion="10" checksum="1854988496"/>
+  <class name="TtFullLeptonicEvent"  ClassVersion="3">
+   <version ClassVersion="3" checksum="3754713216"/>
   </class>
-  <class name="TtSemiLeptonicEvent"  ClassVersion="11">
-   <version ClassVersion="11" checksum="3559376459"/>
-   <version ClassVersion="10" checksum="4150310883"/>
+  <class name="TtSemiLeptonicEvent"  ClassVersion="3">
+   <version ClassVersion="3" checksum="2068896689"/>
   </class>
-  <class name="TtFullHadronicEvent"  ClassVersion="11">
-   <version ClassVersion="11" checksum="350583477"/>
-   <version ClassVersion="10" checksum="3848919223"/>
+  <class name="TtFullHadronicEvent"  ClassVersion="3">
+   <version ClassVersion="3" checksum="3024261627"/>
   </class>
   <class name="edm::Wrapper<TtGenEvent>" />
   <class name="edm::Wrapper<StGenEvent>" />
   <class name="edm::Wrapper<TopGenEvent>" />
   <class name="edm::Wrapper<TtFullLeptonicEvent>" />
   <class name="edm::Wrapper<TtSemiLeptonicEvent>" />
   <class name="edm::Wrapper<TtFullHadronicEvent>" />
-  <class name="edm::Wrapper<reco::CompositeCandidate>" />
 
   <class name="edm::RefProd<TtGenEvent>" />
   <class name="edm::RefProd<StGenEvent>" />
@@ -42,18 +35,15 @@
   <class name="edm::RefProd<TtFullHadronicEvent>" />
 
   <class name="std::pair<WDecay::LeptonType, WDecay::LeptonType>" />
-  <class name="std::pair<reco::CompositeCandidate, std::vector<int> >" />
-  <class name="std::vector<std::pair<reco::CompositeCandidate, std::vector<int> > >" />
-  <class name="edm::Wrapper<std::vector<std::pair<reco::CompositeCandidate, std::vector<int> > > >" />
 
   <class name="std::map<TtEvent::HypoClassKey, int>" />
-  <class name="std::map<TtEvent::HypoClassKey, std::vector<std::pair<reco::CompositeCandidate, std::vector<int> > > >" />
+  <class name="std::map<TtEvent::HypoClassKey, std::vector<std::pair<reco::io_v1::CompositeCandidate, std::vector<int> > > >" />
 
   <class name="TtDilepEvtSolution"  ClassVersion="10">
    <version ClassVersion="10" checksum="3903965368"/>
   </class>
-  <class name="TtSemiEvtSolution"  ClassVersion="10">
-   <version ClassVersion="10" checksum="702702553"/>
+  <class name="TtSemiEvtSolution"  ClassVersion="3">
+   <version ClassVersion="3" checksum="3559385149"/>
   </class>
   <class name="TtHadEvtSolution"  ClassVersion="10">
    <version ClassVersion="10" checksum="4003976374"/>

AnalysisDataFormats/TrackInfo/src/classes_def.xml

@@ -25,15 +25,15 @@
   <class name="edm::Wrapper<edm::AssociationMap<edm::OneToOne<std::vector<reco::Track>,std::vector<reco::TrackInfo>,unsigned int> > >" />
 
   <class name="TPtoRecoTrack" ClassVersion="3">
-   <version ClassVersion="3" checksum="560670808"/>
+   <version ClassVersion="3" checksum="2952712808"/>
   </class>
   <class name="edm::Wrapper<TPtoRecoTrack>"/>
 
   <class name="std::vector<TPtoRecoTrack>"/>
   <class name="edm::Wrapper<std::vector<TPtoRecoTrack> >"/>
 
   <class name="RecoTracktoTP" ClassVersion="3">
-   <version ClassVersion="3" checksum="612992052"/>
+   <version ClassVersion="3" checksum="2837854068"/>
   </class>
   <class name="edm::Wrapper<RecoTracktoTP>"/>
 

DataFormats/BTauReco/interface/BaseTagInfo.h

@@ -8,28 +8,32 @@
 #include "DataFormats/BTauReco/interface/TaggingVariable.h"
 
 namespace reco {
+  namespace io_v1 {
 
-  class BaseTagInfo {
-  public:
-    BaseTagInfo(void) {}
+    class BaseTagInfo {
+    public:
+      BaseTagInfo(void) {}
 
-    virtual ~BaseTagInfo(void) {}
+      virtual ~BaseTagInfo(void) {}
 
-    /// clone
-    virtual BaseTagInfo* clone(void) const { return new BaseTagInfo(*this); }
+      /// clone
+      virtual BaseTagInfo* clone(void) const { return new BaseTagInfo(*this); }
 
-    /// returns a polymorphic reference to the tagged jet
-    virtual edm::RefToBase<Jet> jet(void) const { return edm::RefToBase<Jet>(); }
+      /// returns a polymorphic reference to the tagged jet
+      virtual edm::RefToBase<Jet> jet(void) const { return edm::RefToBase<Jet>(); }
 
-    /// returns a list of tracks associated to the jet
-    virtual TrackRefVector tracks(void) const { return TrackRefVector(); }
+      /// returns a list of tracks associated to the jet
+      virtual TrackRefVector tracks(void) const { return TrackRefVector(); }
 
-    /// check if the algorithm is using the tracks or not
-    virtual bool hasTracks(void) const { return false; }
+      /// check if the algorithm is using the tracks or not
+      virtual bool hasTracks(void) const { return false; }
 
-    /// returns a description of the extended informations in a TaggingVariableList
-    virtual TaggingVariableList taggingVariables(void) const { return TaggingVariableList(); }
-  };
+      /// returns a description of the extended informations in a TaggingVariableList
+      virtual TaggingVariableList taggingVariables(void) const { return TaggingVariableList(); }
+    };
+
+  }  // namespace io_v1
+  using BaseTagInfo = io_v1::BaseTagInfo;
 
   DECLARE_EDM_REFS(BaseTagInfo)
 

DataFormats/BTauReco/interface/JetTagInfo.h

@@ -5,35 +5,37 @@
 #include "DataFormats/BTauReco/interface/BaseTagInfo.h"
 
 namespace reco {
+  namespace io_v1 {
 
-  class JetTagInfo : public BaseTagInfo {
-  public:
-    JetTagInfo(void) : m_jet() {}
+    class JetTagInfo : public BaseTagInfo {
+    public:
+      JetTagInfo(void) : m_jet() {}
 
-    template <typename T>
-    JetTagInfo(const edm::Ref<T>& jetRef) : m_jet(jetRef) {}
+      template <typename T>
+      JetTagInfo(const edm::Ref<T>& jetRef) : m_jet(jetRef) {}
 
-    JetTagInfo(const edm::RefToBase<Jet>& jetRef) : m_jet(jetRef) {}
+      JetTagInfo(const edm::RefToBase<Jet>& jetRef) : m_jet(jetRef) {}
 
-    ~JetTagInfo(void) override {}
+      ~JetTagInfo(void) override {}
 
-    JetTagInfo* clone(void) const override { return new JetTagInfo(*this); }
+      JetTagInfo* clone(void) const override { return new JetTagInfo(*this); }
 
-    edm::RefToBase<Jet> jet(void) const override { return m_jet; }
+      edm::RefToBase<Jet> jet(void) const override { return m_jet; }
 
-    template <typename T>
-    void setJetRef(const edm::Ref<T>& jetRef) {
-      m_jet = edm::RefToBase<Jet>(jetRef);
-    }
+      template <typename T>
+      void setJetRef(const edm::Ref<T>& jetRef) {
+        m_jet = edm::RefToBase<Jet>(jetRef);
+      }
 
-    void setJetRef(const edm::RefToBase<Jet>& jetRef) { m_jet = edm::RefToBase<Jet>(jetRef); }
+      void setJetRef(const edm::RefToBase<Jet>& jetRef) { m_jet = edm::RefToBase<Jet>(jetRef); }
 
-  protected:
-    edm::RefToBase<Jet> m_jet;
-  };
+    protected:
+      edm::RefToBase<Jet> m_jet;
+    };
 
+  }  // namespace io_v1
+  using JetTagInfo = io_v1::JetTagInfo;
   DECLARE_EDM_REFS(JetTagInfo)
-
 }  // namespace reco
 
 #endif  // DataFormats_BTauReco_JetTagInfo_h

DataFormats/BTauReco/interface/PixelClusterTagInfo.h

@@ -6,69 +6,70 @@
 #include "DataFormats/BTauReco/interface/BaseTagInfo.h"
 
 namespace reco {
-
-  struct PixelClusterProperties {
-    float x = 0;
-    float y = 0;
-    float z = 0;
-    int charge = 0;
-    unsigned int layer = 0;
-  };
-
-  struct PixelClusterData {
-    std::vector<int8_t> r004;
-    std::vector<int8_t> r006;
-    std::vector<int8_t> r008;
-    std::vector<int8_t> r010;
-    std::vector<int8_t> r016;
-    std::vector<int8_t> rvar;
-    std::vector<unsigned int> rvwt;
-    PixelClusterData(unsigned int l = 4) {
-      r004 = std::vector<int8_t>(l, 0);
-      r006 = std::vector<int8_t>(l, 0);
-      r008 = std::vector<int8_t>(l, 0);
-      r010 = std::vector<int8_t>(l, 0);
-      r016 = std::vector<int8_t>(l, 0);
-      rvar = std::vector<int8_t>(l, 0);
-      rvwt = std::vector<unsigned int>(l, 0);
-    }
-    CMS_CLASS_VERSION(3)
-  };
-
-  class PixelClusterTagInfo : public BaseTagInfo {
-  public:
-    PixelClusterTagInfo() {}
-
-    PixelClusterTagInfo(const PixelClusterData& data, const edm::RefToBase<Jet>& ref)
-        : pixelClusters_(data), jetRef_(ref) {}
-
-    ~PixelClusterTagInfo() override {}
-
-    // without overriding clone from base class will be store/retrieved
-    PixelClusterTagInfo* clone(void) const override { return new PixelClusterTagInfo(*this); }
-
-    // method to set the jet RefToBase
-    void setJetRef(const edm::RefToBase<Jet>& ref) { jetRef_ = ref; }
-
-    // method to jet the jet RefToBase
-    edm::RefToBase<Jet> jet() const override { return jetRef_; }
-
-    // method to set the PixelClusterData
-    void setData(const PixelClusterData& data) { pixelClusters_ = data; }
-
-    // method to get the PixelClusterData struct
-    const PixelClusterData& data() const { return pixelClusters_; }
-
-    CMS_CLASS_VERSION(3)
-
-  private:
-    PixelClusterData pixelClusters_;
-
-    edm::RefToBase<Jet> jetRef_;
-  };
-
-  typedef std::vector<reco::PixelClusterTagInfo> PixelClusterTagInfoCollection;
-
+  namespace io_v1 {
+
+    struct PixelClusterProperties {
+      float x = 0;
+      float y = 0;
+      float z = 0;
+      int charge = 0;
+      unsigned int layer = 0;
+    };
+
+    struct PixelClusterData {
+      std::vector<int8_t> r004;
+      std::vector<int8_t> r006;
+      std::vector<int8_t> r008;
+      std::vector<int8_t> r010;
+      std::vector<int8_t> r016;
+      std::vector<int8_t> rvar;
+      std::vector<unsigned int> rvwt;
+      PixelClusterData(unsigned int l = 4) {
+        r004 = std::vector<int8_t>(l, 0);
+        r006 = std::vector<int8_t>(l, 0);
+        r008 = std::vector<int8_t>(l, 0);
+        r010 = std::vector<int8_t>(l, 0);
+        r016 = std::vector<int8_t>(l, 0);
+        rvar = std::vector<int8_t>(l, 0);
+        rvwt = std::vector<unsigned int>(l, 0);
+      }
+    };
+
+    class PixelClusterTagInfo : public BaseTagInfo {
+    public:
+      PixelClusterTagInfo() {}
+
+      PixelClusterTagInfo(const PixelClusterData& data, const edm::RefToBase<Jet>& ref)
+          : pixelClusters_(data), jetRef_(ref) {}
+
+      ~PixelClusterTagInfo() override {}
+
+      // without overriding clone from base class will be store/retrieved
+      PixelClusterTagInfo* clone(void) const override { return new PixelClusterTagInfo(*this); }
+
+      // method to set the jet RefToBase
+      void setJetRef(const edm::RefToBase<Jet>& ref) { jetRef_ = ref; }
+
+      // method to jet the jet RefToBase
+      edm::RefToBase<Jet> jet() const override { return jetRef_; }
+
+      // method to set the PixelClusterData
+      void setData(const PixelClusterData& data) { pixelClusters_ = data; }
+
+      // method to get the PixelClusterData struct
+      const PixelClusterData& data() const { return pixelClusters_; }
+
+    private:
+      PixelClusterData pixelClusters_;
+
+      edm::RefToBase<Jet> jetRef_;
+    };
+
+  }  // namespace io_v1
+  using PixelClusterProperties = io_v1::PixelClusterProperties;
+  using PixelClusterData = io_v1::PixelClusterData;
+  using PixelClusterTagInfo = io_v1::PixelClusterTagInfo;
+  using PixelClusterTagInfoCollection = std::vector<reco::PixelClusterTagInfo>;
 }  // namespace reco
 
 #endif  // DataFormats_BTauReco_PixelClusterTagInfo_h