[EVO] Moved stored products in l1t:: to versioned namespace

DataFormats/HLTReco/src/classes_def.xml

@@ -37,32 +37,27 @@
 
   <class name="trigger::TriggerObjectCollection"/>
   <class name="trigger::TriggerRefsCollections" ClassVersion="3">
-   <version ClassVersion="3" checksum="2127445073"/>
+   <version ClassVersion="3" checksum="1210037489"/>
   </class>
   <class name="trigger::TriggerFilterObjectWithRefs" ClassVersion="3">
-   <version ClassVersion="3" checksum="579919418"/>
+   <version ClassVersion="3" checksum="4124915994"/>
   </class>
 
   <class name="trigger::TriggerEvent::TriggerFilterObject" ClassVersion="10">
    <version ClassVersion="10" checksum="886279077"/>
   </class>
   <class name="std::vector<trigger::TriggerEvent::TriggerFilterObject>"/>
+  <!-- TriggerEvent is stored as part of RAW -->
   <class name="trigger::TriggerEvent" ClassVersion="11">
    <version ClassVersion="11" checksum="3351458717"/>
    <version ClassVersion="10" checksum="1112210423"/>
   </class>
-  <class name="trigger::TriggerEventWithRefs::TriggerFilterObject" ClassVersion="18">
-   <version ClassVersion="18" checksum="3279814163"/>
-   <version ClassVersion="17" checksum="3926145865"/>
-   <version ClassVersion="16" checksum="752200108"/>
-   <version ClassVersion="15" checksum="450435068"/>
-   <version ClassVersion="14" checksum="1673531968"/>
-   <version ClassVersion="13" checksum="1672519577"/>
-   <version ClassVersion="12" checksum="2301242282"/>
+  <class name="trigger::TriggerEventWithRefs::TriggerFilterObject" ClassVersion="3">
+   <version ClassVersion="3" checksum="3279814163"/>
   </class>
   <class name="std::vector<trigger::TriggerEventWithRefs::TriggerFilterObject>"/>
   <class name="trigger::TriggerEventWithRefs" ClassVersion="3">
-   <version ClassVersion="3" checksum="3617316456"/>
+   <version ClassVersion="3" checksum="307844616"/>
   </class>
 
   <class name="edm::Wrapper<trigger::TriggerObjectCollection>" splitLevel="0"/>

DataFormats/HcalIsolatedTrack/src/classes_def.xml

@@ -3,7 +3,7 @@
   <class name="edm::Wrapper<std::map <int,std::pair<double,double> > >"/> 
 
   <class name="reco::IsolatedPixelTrackCandidate" ClassVersion="3">
-   <version ClassVersion="3" checksum="369629847"/>
+   <version ClassVersion="3" checksum="412602791"/>
   </class>
   <class name="reco::IsolatedPixelTrackCandidateCollection"/>
   <class name="reco::IsolatedPixelTrackCandidateRef"/>

DataFormats/L1TCalorimeter/interface/CaloCluster.h

@@ -5,76 +5,77 @@
 #include "DataFormats/L1Trigger/interface/BXVector.h"
 
 namespace l1t {
+  namespace io_v1 {
+    class CaloCluster : public L1Candidate {
+    public:
+      enum ClusterFlag {
+        INCLUDE_SEED = 0,
+        INCLUDE_NW = 1,
+        INCLUDE_N = 2,
+        INCLUDE_NE = 3,
+        INCLUDE_E = 4,
+        INCLUDE_SE = 5,
+        INCLUDE_S = 6,
+        INCLUDE_SW = 7,
+        INCLUDE_W = 8,
+        INCLUDE_NN = 9,
+        INCLUDE_SS = 10,
+        TRIM_LEFT = 11,
+        IS_SECONDARY = 12,
+        MERGE_UPDOWN = 13,    // 0=up, 1=down
+        MERGE_LEFTRIGHT = 14  // 0=left, 1=right
+      };
 
-  class CaloCluster : public L1Candidate {
-  public:
-    enum ClusterFlag {
-      INCLUDE_SEED = 0,
-      INCLUDE_NW = 1,
-      INCLUDE_N = 2,
-      INCLUDE_NE = 3,
-      INCLUDE_E = 4,
-      INCLUDE_SE = 5,
-      INCLUDE_S = 6,
-      INCLUDE_SW = 7,
-      INCLUDE_W = 8,
-      INCLUDE_NN = 9,
-      INCLUDE_SS = 10,
-      TRIM_LEFT = 11,
-      IS_SECONDARY = 12,
-      MERGE_UPDOWN = 13,    // 0=up, 1=down
-      MERGE_LEFTRIGHT = 14  // 0=left, 1=right
-    };
-
-  public:
-    CaloCluster() {}
-    CaloCluster(const LorentzVector p4, int pt = 0, int eta = 0, int phi = 0);
+    public:
+      CaloCluster() {}
+      CaloCluster(const LorentzVector p4, int pt = 0, int eta = 0, int phi = 0);
 
-    ~CaloCluster() override;
+      ~CaloCluster() override;
 
-    void setClusterFlag(ClusterFlag flag, bool val = true);
-    void setHwPtEm(int pt);
-    void setHwPtHad(int pt);
-    void setHwSeedPt(int pt);
-    void setFgEta(int fgEta);
-    void setFgPhi(int fgPhi);
-    void setHOverE(int hOverE);
-    void setFgECAL(int fgECAL);
+      void setClusterFlag(ClusterFlag flag, bool val = true);
+      void setHwPtEm(int pt);
+      void setHwPtHad(int pt);
+      void setHwSeedPt(int pt);
+      void setFgEta(int fgEta);
+      void setFgPhi(int fgPhi);
+      void setHOverE(int hOverE);
+      void setFgECAL(int fgECAL);
 
-    bool checkClusterFlag(ClusterFlag flag) const;
-    bool isValid() const;
-    int hwPtEm() const;
-    int hwPtHad() const;
-    int hwSeedPt() const;
-    int fgEta() const;
-    int fgPhi() const;
-    int hOverE() const;
-    int fgECAL() const;
-    int clusterFlags() const { return m_clusterFlags; }
+      bool checkClusterFlag(ClusterFlag flag) const;
+      bool isValid() const;
+      int hwPtEm() const;
+      int hwPtHad() const;
+      int hwSeedPt() const;
+      int fgEta() const;
+      int fgPhi() const;
+      int hOverE() const;
+      int fgECAL() const;
+      int clusterFlags() const { return m_clusterFlags; }
 
-    bool operator<(const CaloCluster& cl) const;
-    bool operator>(const CaloCluster& cl) const { return cl < *this; };
-    bool operator<=(const CaloCluster& cl) const { return !(cl > *this); };
-    bool operator>=(const CaloCluster& cl) const { return !(cl < *this); };
+      bool operator<(const CaloCluster& cl) const;
+      bool operator>(const CaloCluster& cl) const { return cl < *this; };
+      bool operator<=(const CaloCluster& cl) const { return !(cl > *this); };
+      bool operator>=(const CaloCluster& cl) const { return !(cl < *this); };
 
-  private:
-    // Summary of clustering outcomes
-    int m_clusterFlags{0};  // see ClusterFlag bits (15 bits, will evolve)
+    private:
+      // Summary of clustering outcomes
+      int m_clusterFlags{0};  // see ClusterFlag bits (15 bits, will evolve)
 
-    // Energies
-    int m_hwPtEm{0};
-    int m_hwPtHad{0};
-    int m_hwSeedPt{0};
+      // Energies
+      int m_hwPtEm{0};
+      int m_hwPtHad{0};
+      int m_hwSeedPt{0};
 
-    // fine grained position
-    int m_fgEta{0};  // 2 bits (to be defined in agreement with GT inputs)
-    int m_fgPhi{0};  // 2 bits (to be defined in agreement with GT inputs)
-
-    // identification variables
-    int m_hOverE{0};  // 8 bits (between 0 and 1 -> resolution=1/256=0.39%). Number of bits is not definitive
-    int m_fgECAL{0};  // FG bit of the seed tower
-  };
+      // fine grained position
+      int m_fgEta{0};  // 2 bits (to be defined in agreement with GT inputs)
+      int m_fgPhi{0};  // 2 bits (to be defined in agreement with GT inputs)
 
+      // identification variables
+      int m_hOverE{0};  // 8 bits (between 0 and 1 -> resolution=1/256=0.39%). Number of bits is not definitive
+      int m_fgECAL{0};  // FG bit of the seed tower
+    };
+  }  // namespace io_v1
+  using CaloCluster = io_v1::CaloCluster;
   typedef BXVector<CaloCluster> CaloClusterBxCollection;
 
 }  // namespace l1t

DataFormats/L1TCalorimeter/interface/CaloTower.h

@@ -6,49 +6,51 @@
 
 namespace l1t {
 
-  class CaloTower;
-  typedef BXVector<CaloTower> CaloTowerBxCollection;
-
-  class CaloTower : public L1Candidate {
-  public:
-    CaloTower() : etEm_(0.), etHad_(0.), hwEtEm_(0), hwEtHad_(0), hwEtRatio_(0) {}
-
-    CaloTower(const LorentzVector& p4,
-              double etEm = 0.,
-              double etHad = 0.,
-              int pt = 0,
-              int eta = 0,
-              int phi = 0,
-              int qual = 0,
-              int hwEtEm = 0,
-              int hwEtHad = 0,
-              int hwEtRatio = 0);
-
-    ~CaloTower() override;
-
-    void setEtEm(double et);
-    void setEtHad(double et);
-
-    void setHwEtEm(int et);
-    void setHwEtHad(int et);
-    void setHwEtRatio(int ratio);
-
-    double etEm() const;
-    double etHad() const;
-
-    int hwEtEm() const;
-    int hwEtHad() const;
-    int hwEtRatio() const;
-
-  private:
-    // additional hardware quantities
-    double etEm_;
-    double etHad_;
-
-    int hwEtEm_;
-    int hwEtHad_;
-    int hwEtRatio_;
-  };
+  namespace io_v1 {
+    class CaloTower : public L1Candidate {
+    public:
+      CaloTower() : etEm_(0.), etHad_(0.), hwEtEm_(0), hwEtHad_(0), hwEtRatio_(0) {}
+
+      CaloTower(const LorentzVector& p4,
+                double etEm = 0.,
+                double etHad = 0.,
+                int pt = 0,
+                int eta = 0,
+                int phi = 0,
+                int qual = 0,
+                int hwEtEm = 0,
+                int hwEtHad = 0,
+                int hwEtRatio = 0);
+
+      ~CaloTower() override;
+
+      void setEtEm(double et);
+      void setEtHad(double et);
+
+      void setHwEtEm(int et);
+      void setHwEtHad(int et);
+      void setHwEtRatio(int ratio);
+
+      double etEm() const;
+      double etHad() const;
+
+      int hwEtEm() const;
+      int hwEtHad() const;
+      int hwEtRatio() const;
+
+    private:
+      // additional hardware quantities
+      double etEm_;
+      double etHad_;
+
+      int hwEtEm_;
+      int hwEtHad_;
+      int hwEtRatio_;
+    };
+  }  // namespace io_v1
+  using CaloTower = io_v1::CaloTower;
+
+  using CaloTowerBxCollection = BXVector<CaloTower>;
 
 }  // namespace l1t
 

DataFormats/L1TCalorimeter/src/classes_def.xml

@@ -9,13 +9,17 @@
   <class name="l1t::CaloRegionBxCollection"/>
   <class name="edm::Wrapper<l1t::CaloRegionBxCollection>"/>
 
-  <class name="l1t::CaloTower" />
-  <class name="std::vector<l1t::CaloTower>" />
+  <class name="l1t::io_v1::CaloTower" ClassVersion="3">
+    <version ClassVersion="3" checksum="1330544225"/>
+  </class>
+  <class name="std::vector<l1t::io_v1::CaloTower>" />
   <class name="l1t::CaloTowerBxCollection"/>
   <class name="edm::Wrapper<l1t::CaloTowerBxCollection>"/>
 
-  <class name="l1t::CaloCluster" />
-  <class name="std::vector<l1t::CaloCluster>" />
+  <class name="l1t::io_v1::CaloCluster" ClassVersion="3">
+    <version ClassVersion="3" checksum="3826479007"/>
+  </class>
+  <class name="std::vector<l1t::io_v1::CaloCluster>" />
   <class name="l1t::CaloClusterBxCollection"/>
   <class name="edm::Wrapper<l1t::CaloClusterBxCollection>"/>
 

DataFormats/L1TCalorimeterPhase2/src/classes_def.xml

@@ -5,22 +5,22 @@
 <lcgdict>
 
   <class name="l1tp2::CaloCrystalCluster"  ClassVersion="3">
-         <version ClassVersion="3" checksum="3612859615"/>
+         <version ClassVersion="3" checksum="375396287"/>
   </class>
   <class name="std::vector<l1tp2::CaloCrystalCluster>" />
   <class name="l1tp2::CaloCrystalClusterCollection" />
   <class name="edm::Wrapper<l1tp2::CaloCrystalClusterCollection>" />
   <class name="edm::Ref<l1tp2::CaloCrystalClusterCollection>" />
 
   <class name="l1tp2::CaloJet"  ClassVersion="3">
-         <version ClassVersion="3" checksum="1771236956"/>
+         <version ClassVersion="3" checksum="3035742018"/>
   </class>
   <class name="std::vector<l1tp2::CaloJet>" />
   <class name="l1tp2::CaloJetsCollection" />
   <class name="edm::Wrapper<l1tp2::CaloJetsCollection>" />
 
   <class name="l1tp2::CaloPFCluster"  ClassVersion="3">
-         <version ClassVersion="3" checksum="2510893573"/>
+         <version ClassVersion="3" checksum="2155055229"/>
   </class>
   <class name="std::vector<l1tp2::CaloPFCluster>" />
   <class name="l1tp2::CaloPFClusterCollection" />
@@ -35,7 +35,7 @@
   <class name="edm::Wrapper<std::vector<std::vector<l1tp2::GCTHadDigiCluster> > >" /> 
 
   <class name="l1tp2::CaloTower"  ClassVersion="3">
-         <version ClassVersion="3" checksum="351125807"/>
+         <version ClassVersion="3" checksum="2068588777"/>
   </class>
   <class name="std::vector<l1tp2::CaloTower>" />
   <class name="l1tp2::CaloTowerCollection" />
@@ -71,7 +71,7 @@
   <class name="edm::Wrapper<std::vector<std::vector<l1tp2::GCTEmDigiCluster> > >" />  
 
   <class name="l1tp2::Phase2L1CaloJet"  ClassVersion="3">
-         <version ClassVersion="3" checksum="3359793942"/>
+         <version ClassVersion="3" checksum="374504160"/>
   </class>
   <class name="std::vector<l1tp2::Phase2L1CaloJet>" />
   <class name="l1tp2::Phase2L1CaloJetCollection" />