[EVO] Moved data products in to io_v1 namespace

DataFormats/HGCalReco/interface/TracksterFwd.h

@@ -2,7 +2,10 @@
 #define DataFormats_HGCalReco_TracksterFwd_h
 
 namespace ticl {
-  class Trackster;
-}
+  namespace io_v1 {
+    class Trackster;
+  }
+  using Trackster = io_v1::Trackster;
+}  // namespace ticl
 
 #endif

DataFormats/HGCalReco/src/classes_def.xml

@@ -1,22 +1,13 @@
 
 <lcgdict>
-  <class name="ticl::Trackster" ClassVersion="12">
-    <version ClassVersion="12" checksum="912917580"/>
-    <version ClassVersion="11" checksum="2111726404"/>
-    <version ClassVersion="10" checksum="556627704"/>
-    <version ClassVersion="9" checksum="1001808235"/>
-    <version ClassVersion="8" checksum="749412802"/>
-    <version ClassVersion="7" checksum="1072014319"/>
-    <version ClassVersion="6" checksum="3003722924"/>
-    <version ClassVersion="5" checksum="1679804166"/>
-    <version ClassVersion="4" checksum="2963413313"/>
-    <version ClassVersion="3" checksum="3878166595"/>
+  <class name="ticl::io_v1::Trackster" ClassVersion="3">
+    <version ClassVersion="3" checksum="2779314320"/>
   </class>
-  <class name="std::vector<ticl::Trackster>" />
-  <class name="edm::RefProd<std::vector<ticl::Trackster> >"/>
-  <class name="std::pair<edm::RefProd<std::vector<ticl::Trackster> >, edm::RefProd<std::vector<ticl::Trackster> > >"/>
-  <class name="edm::Wrapper<ticl::Trackster>" />
-  <class name="edm::Wrapper<std::vector<ticl::Trackster> >" />
+  <class name="std::vector<ticl::io_v1::Trackster>" />
+  <class name="edm::RefProd<std::vector<ticl::io_v1::Trackster> >"/>
+  <class name="std::pair<edm::RefProd<std::vector<ticl::io_v1::Trackster> >, edm::RefProd<std::vector<ticl::io_v1::Trackster> > >"/>
+  <class name="edm::Wrapper<ticl::io_v1::Trackster>" />
+  <class name="edm::Wrapper<std::vector<ticl::io_v1::Trackster> >" />
 
   <class name="ticl::TICLLayerTile" persistent="false">
     <field name="tile_" transient="true"/>
@@ -68,7 +59,7 @@
   <class name="edm::Wrapper<std::vector<TICLSeedingRegion> >" />
 
   <class name="TICLCandidate" ClassVersion="3">
-   <version ClassVersion="3" checksum="1904138988"/>
+   <version ClassVersion="3" checksum="3268647916"/>
   </class>
   <class name="std::vector<TICLCandidate>" />
   <class name="edm::Wrapper<TICLCandidate>" />

DataFormats/HLTReco/interface/TriggerFilterObjectWithRefs.h

@@ -27,55 +27,59 @@
 
 namespace trigger {
 
-  /// Transient book-keeping EDProduct filled by HLTFilter module to
-  /// record physics objects firing the filter (never persistet in
-  /// production; same functionality but different implementation
-  /// compared to the old HLT data model's HLTFilterObjectWithRefs
-  /// class)
-  class TriggerFilterObjectWithRefs : public TriggerRefsCollections {
-    /// data members
-  private:
-    int path_;
-    int module_;
-    std::vector<std::string> collectionTags_;
-
-    /// methods
-  public:
-    /// constructors
-    TriggerFilterObjectWithRefs() : TriggerRefsCollections(), path_(-9), module_(-9), collectionTags_() {}
-
-    TriggerFilterObjectWithRefs(int path, int module)
-        : TriggerRefsCollections(), path_(path), module_(module), collectionTags_() {}
-
-    /// accessors
-    int path() const { return path_; }
-    int module() const { return module_; }
-
-    /// collectionTags
-    void addCollectionTag(const edm::InputTag& collectionTag) { collectionTags_.push_back(collectionTag.encode()); }
-
-    void getCollectionTags(std::vector<edm::InputTag>& collectionTags) const {
-      const trigger::size_type n(collectionTags_.size());
-      collectionTags.resize(n);
-      for (trigger::size_type i = 0; i != n; ++i) {
-        collectionTags[i] = edm::InputTag(collectionTags_[i]);
+  namespace io_v1 {
+    /// Transient book-keeping EDProduct filled by HLTFilter module to
+    /// record physics objects firing the filter (never persistet in
+    /// production; same functionality but different implementation
+    /// compared to the old HLT data model's HLTFilterObjectWithRefs
+    /// class)
+    class TriggerFilterObjectWithRefs : public TriggerRefsCollections {
+      /// data members
+    private:
+      int path_;
+      int module_;
+      std::vector<std::string> collectionTags_;
+
+      /// methods
+    public:
+      /// constructors
+      TriggerFilterObjectWithRefs() : TriggerRefsCollections(), path_(-9), module_(-9), collectionTags_() {}
+
+      TriggerFilterObjectWithRefs(int path, int module)
+          : TriggerRefsCollections(), path_(path), module_(module), collectionTags_() {}
+
+      /// accessors
+      int path() const { return path_; }
+      int module() const { return module_; }
+
+      /// collectionTags
+      void addCollectionTag(const edm::InputTag& collectionTag) { collectionTags_.push_back(collectionTag.encode()); }
+
+      void getCollectionTags(std::vector<edm::InputTag>& collectionTags) const {
+        const trigger::size_type n(collectionTags_.size());
+        collectionTags.resize(n);
+        for (trigger::size_type i = 0; i != n; ++i) {
+          collectionTags[i] = edm::InputTag(collectionTags_[i]);
+        }
       }
-    }
-
-    /// low-level technical accessor
-    const std::vector<std::string>& getCollectionTagsAsStrings() const { return collectionTags_; }
-
-    /// utility
-    void swap(TriggerFilterObjectWithRefs& other) {
-      TriggerRefsCollections::swap(other);  // swap base instance
-      std::swap(path_, other.path_);
-      std::swap(module_, other.module_);
-      std::swap(collectionTags_, other.collectionTags_);  // use specialized version for STL containers
-    }
-  };
-
-  // picked up via argument dependent lookup, e-g- by boost::swap()
-  inline void swap(TriggerFilterObjectWithRefs& first, TriggerFilterObjectWithRefs& second) { first.swap(second); }
+
+      /// low-level technical accessor
+      const std::vector<std::string>& getCollectionTagsAsStrings() const { return collectionTags_; }
+
+      /// utility
+      void swap(TriggerFilterObjectWithRefs& other) {
+        TriggerRefsCollections::swap(other);  // swap base instance
+        std::swap(path_, other.path_);
+        std::swap(module_, other.module_);
+        std::swap(collectionTags_, other.collectionTags_);  // use specialized version for STL containers
+      }
+    };
+
+    // picked up via argument dependent lookup, e-g- by boost::swap()
+    inline void swap(TriggerFilterObjectWithRefs& first, TriggerFilterObjectWithRefs& second) { first.swap(second); }
+  }  // namespace io_v1
+
+  using TriggerFilterObjectWithRefs = io_v1::TriggerFilterObjectWithRefs;
 
 }  // namespace trigger
 

DataFormats/HLTReco/interface/TriggerFilterObjectWithRefsFwd.h

@@ -2,7 +2,11 @@
 #define HLTReco_TriggerFilterObjectWithRefsFwd_h
 
 namespace trigger {
-  class TriggerFilterObjectWithRefs;
-}
+  namespace io_v1 {
+    class TriggerFilterObjectWithRefs;
+  }
+  using TriggerFilterObjectWithRefs = io_v1::TriggerFilterObjectWithRefs;
+
+}  // namespace trigger
 
 #endif

DataFormats/HLTReco/src/classes_def.xml

@@ -1,28 +1,27 @@
 <lcgdict>
 
-  <class name="edm::ModuleTime" ClassVersion="10">
-   <version ClassVersion="10" checksum="1426984345"/>
+  <class name="edm::ModuleTime" ClassVersion="3">
+   <version ClassVersion="3" checksum="1426984345"/>
   </class>
   <class name="std::vector<edm::ModuleTime>"/>
-  <class name="edm::EventTime" ClassVersion="10">
-   <version ClassVersion="10" checksum="4025404982"/>
+  <class name="edm::EventTime" ClassVersion="3">
+   <version ClassVersion="3" checksum="4025404982"/>
   </class>
   <class name="edm::Wrapper<edm::EventTime>" splitLevel="0"/>
 
-  <class name="HLTPerformanceInfo" ClassVersion="10">
-   <version ClassVersion="10" checksum="3666102048"/>
+  <class name="HLTPerformanceInfo" ClassVersion="3">
+   <version ClassVersion="3" checksum="3666102048"/>
   </class>
   <class name="edm::Wrapper<HLTPerformanceInfo >" splitLevel="0"/>
 
-  <class name="HLTPerformanceInfo::Module" ClassVersion="10">
-   <version ClassVersion="10" checksum="3885654529"/>
+  <class name="HLTPerformanceInfo::Module" ClassVersion="3">
+   <version ClassVersion="3" checksum="3885654529"/>
   </class>
   <class name="std::vector<HLTPerformanceInfo::Module>"/>
   <class name="std::vector<HLTPerformanceInfo::Module>::const_iterator"/>
 
-  <class name="HLTPerformanceInfo::Path" ClassVersion="11">
-   <version ClassVersion="10" checksum="3100415018"/>
-   <version ClassVersion="11" checksum="131259281"/>
+  <class name="HLTPerformanceInfo::Path" ClassVersion="3">
+   <version ClassVersion="3" checksum="131259281"/>
   </class>
   <class name="std::vector<HLTPerformanceInfo::Path>"/>
   <class name="std::vector<HLTPerformanceInfo::Path>::const_iterator"/>
@@ -39,8 +38,8 @@
   <class name="trigger::TriggerRefsCollections" ClassVersion="3">
    <version ClassVersion="3" checksum="1210037489"/>
   </class>
-  <class name="trigger::TriggerFilterObjectWithRefs" ClassVersion="3">
-   <version ClassVersion="3" checksum="4124915994"/>
+  <class name="trigger::io_v1::TriggerFilterObjectWithRefs" ClassVersion="3">
+   <version ClassVersion="3" checksum="1456673002"/>
   </class>
 
   <class name="trigger::TriggerEvent::TriggerFilterObject" ClassVersion="10">
@@ -61,13 +60,13 @@
   </class>
 
   <class name="edm::Wrapper<trigger::TriggerObjectCollection>" splitLevel="0"/>
-  <class name="edm::Wrapper<trigger::TriggerFilterObjectWithRefs>" splitLevel="0"/>
+  <class name="edm::Wrapper<trigger::io_v1::TriggerFilterObjectWithRefs>" splitLevel="0"/>
   <class name="edm::Wrapper<trigger::TriggerEvent>" splitLevel="0"/>
   <class name="edm::Wrapper<trigger::TriggerEventWithRefs>" splitLevel="0"/>
 
   <class name="std::map<std::string,std::vector<unsigned int> >"/>
-  <class name="trigger::HLTPrescaleTable" ClassVersion="10">
-   <version ClassVersion="10" checksum="2181075001"/>
+  <class name="trigger::HLTPrescaleTable" ClassVersion="3">
+   <version ClassVersion="3" checksum="2181075001"/>
   </class>
   <class name="edm::Wrapper<trigger::HLTPrescaleTable>"/>
 

DataFormats/L1CSCTrackFinder/interface/TrackStub.h

@@ -18,57 +18,59 @@
 #include <DataFormats/L1CSCTrackFinder/interface/CSCTFConstants.h>
 
 namespace csctf {
+  namespace io_v1 {
+    class TrackStub : public CSCCorrelatedLCTDigi {
+    public:
+      TrackStub() {}
+      TrackStub(const CSCCorrelatedLCTDigi &, const DetId &);
+      TrackStub(const CSCCorrelatedLCTDigi &, const DetId &, const unsigned &phi, const unsigned &eta);
 
-  class TrackStub : public CSCCorrelatedLCTDigi {
-  public:
-    TrackStub() {}
-    TrackStub(const CSCCorrelatedLCTDigi &, const DetId &);
-    TrackStub(const CSCCorrelatedLCTDigi &, const DetId &, const unsigned &phi, const unsigned &eta);
+      /// set Eta and Phi from integer values.
+      void setEtaPacked(const unsigned &eta_) { theEta_ = eta_; }
+      void setPhiPacked(const unsigned &phi_) { thePhi_ = phi_; }
 
-    /// set Eta and Phi from integer values.
-    void setEtaPacked(const unsigned &eta_) { theEta_ = eta_; }
-    void setPhiPacked(const unsigned &phi_) { thePhi_ = phi_; }
+      /// return the Eta Value of this stub's position.
+      double etaValue() const { return (theEta_ * theEtaBinning + CSCTFConstants::minEta); }
+      /// return the Phi Value of this stub's position in local coordinates.
+      double phiValue() const { return (thePhi_ * thePhiBinning); }
 
-    /// return the Eta Value of this stub's position.
-    double etaValue() const { return (theEta_ * theEtaBinning + CSCTFConstants::minEta); }
-    /// return the Phi Value of this stub's position in local coordinates.
-    double phiValue() const { return (thePhi_ * thePhiBinning); }
+      /// Return the binned eta for this stub.
+      unsigned etaPacked() const { return theEta_; }
+      /// Return the binned phi for this stub.
 
-    /// Return the binned eta for this stub.
-    unsigned etaPacked() const { return theEta_; }
-    /// Return the binned phi for this stub.
+      unsigned phiPacked() const { return thePhi_; }
 
-    unsigned phiPacked() const { return thePhi_; }
+      /// Get the digi this stub was made from.
+      const CSCCorrelatedLCTDigi *getDigi() const { return dynamic_cast<const CSCCorrelatedLCTDigi *>(this); }
+      DetId getDetId() const { return DetId(theDetId_); }
 
-    /// Get the digi this stub was made from.
-    const CSCCorrelatedLCTDigi *getDigi() const { return dynamic_cast<const CSCCorrelatedLCTDigi *>(this); }
-    DetId getDetId() const { return DetId(theDetId_); }
+      /// Time / Space identifiers
+      /// See CSCTransientDataType.h for more details.
+      unsigned endcap() const;
+      unsigned station() const;
+      unsigned sector() const;
+      unsigned subsector() const;
+      unsigned cscid() const;
+      unsigned cscidSeparateME1a() const;
+      int BX() const { return getBX(); }
 
-    /// Time / Space identifiers
-    /// See CSCTransientDataType.h for more details.
-    unsigned endcap() const;
-    unsigned station() const;
-    unsigned sector() const;
-    unsigned subsector() const;
-    unsigned cscid() const;
-    unsigned cscidSeparateME1a() const;
-    int BX() const { return getBX(); }
+      /// Comparision Operators, used for MPC sorting
+      bool operator>(const TrackStub &) const;
+      bool operator<(const TrackStub &) const;
+      bool operator>=(const TrackStub &rhs) const { return !(this->operator<(rhs)); }
+      bool operator<=(const TrackStub &rhs) const { return !(this->operator>(rhs)); }
+      bool operator==(const TrackStub &rhs) const {
+        return ((theDetId_ == rhs.theDetId_) && (*(getDigi()) == *(rhs.getDigi())));
+      }
+      bool operator!=(const TrackStub &rhs) const { return !(this->operator==(rhs)); }
 
-    /// Comparision Operators, used for MPC sorting
-    bool operator>(const TrackStub &) const;
-    bool operator<(const TrackStub &) const;
-    bool operator>=(const TrackStub &rhs) const { return !(this->operator<(rhs)); }
-    bool operator<=(const TrackStub &rhs) const { return !(this->operator>(rhs)); }
-    bool operator==(const TrackStub &rhs) const {
-      return ((theDetId_ == rhs.theDetId_) && (*(getDigi()) == *(rhs.getDigi())));
-    }
-    bool operator!=(const TrackStub &rhs) const { return !(this->operator==(rhs)); }
-
-  private:
-    uint32_t theDetId_;
-    unsigned thePhi_, theEta_, link_;
-    static const double theEtaBinning, thePhiBinning;
-  };
+    private:
+      uint32_t theDetId_;
+      unsigned thePhi_, theEta_, link_;
+      static const double theEtaBinning, thePhiBinning;
+    };
+  }  // namespace io_v1
+  using TrackStub = io_v1::TrackStub;
 }  // namespace csctf
 
 #endif

DataFormats/L1CSCTrackFinder/interface/TrackStubFwd.h

@@ -2,7 +2,10 @@
 #define L1CSCTrackFinder_TrackStubFwd_h
 
 namespace csctf {
-  class TrackStub;
-}
+  namespace io_v1 {
+    class TrackStub;
+  }
+  using TrackStub = io_v1::TrackStub;
+}  // namespace csctf
 
 #endif