Pr91x L1T integration v92.10

DataFormats/L1Trigger/interface/Muon.h

@@ -32,7 +32,11 @@ namespace l1t {
       int isoSum = 0,
       int dPhi = 0,
       int dEta = 0,
-      int rank = 0);
+      int rank = 0,
+      int hwEtaAtVtx = 0,
+      int hwPhiAtVtx = 0,
+      double etaAtVtx = 0.,
+      double phiAtVtx = 0.);
 
     Muon( const PolarLorentzVector& p4,
       int pt=0,
@@ -48,35 +52,49 @@ namespace l1t {
       int isoSum = 0,
       int dPhi = 0,
       int dEta = 0,
-      int rank = 0);
+      int rank = 0,
+      int hwEtaAtVtx = 0,
+      int hwPhiAtVtx = 0,
+      double etaAtVtx = 0.,
+      double phiAtVtx = 0.);
 
     ~Muon();    
 
-    // set integer values
-    void setHwCharge(int charge);
-    void setHwChargeValid(int valid);
-    void setTfMuonIndex(int index);
-    void setHwTag(int tag);
-
-    void setHwIsoSum(int isoSum);
-    void setHwDPhiExtra(int dPhi);
-    void setHwDEtaExtra(int dEta);
-    void setHwRank(int rank);
+    // set values
+    inline void setHwCharge(int charge) { hwCharge_ = charge; };
+    inline void setHwChargeValid(int valid) { hwChargeValid_ = valid; };
+    inline void setTfMuonIndex(int index) { tfMuonIndex_ = index; };
+    inline void setHwTag(int tag) { hwTag_ = tag; };
+
+    inline void setHwEtaAtVtx(int hwEtaAtVtx) { hwEtaAtVtx_ = hwEtaAtVtx; };
+    inline void setHwPhiAtVtx(int hwPhiAtVtx) { hwPhiAtVtx_ = hwPhiAtVtx; };
+    inline void setEtaAtVtx(double etaAtVtx) { etaAtVtx_ = etaAtVtx; };
+    inline void setPhiAtVtx(double phiAtVtx) { phiAtVtx_ = phiAtVtx; };
+
+    inline void setHwIsoSum(int isoSum) { hwIsoSum_ = isoSum; };
+    inline void setHwDPhiExtra(int dPhi) { hwDPhiExtra_ = dPhi; };
+    inline void setHwDEtaExtra(int dEta) { hwDEtaExtra_ = dEta; };
+    inline void setHwRank(int rank) { hwRank_ = rank; };
+
+    inline void setDebug(bool debug) { debug_ = debug; };
 
-    void setDebug(bool debug);
+    // methods to retrieve values
+    inline int hwCharge() const { return hwCharge_; };
+    inline int hwChargeValid() const { return hwChargeValid_; };
+    inline int tfMuonIndex() const { return tfMuonIndex_; };
+    inline int hwTag() const { return hwTag_; };
 
-    // methods to retrieve integer values
-    int hwCharge() const;
-    int hwChargeValid() const;
-    int tfMuonIndex() const;
-    int hwTag() const;
+    inline int hwEtaAtVtx() const { return hwEtaAtVtx_; };
+    inline int hwPhiAtVtx() const { return hwPhiAtVtx_; };
+    inline double etaAtVtx() const { return etaAtVtx_; };
+    inline double phiAtVtx() const { return phiAtVtx_; };
 
-    int hwIsoSum() const;
-    int hwDPhiExtra() const;
-    int hwDEtaExtra() const;
-    int hwRank() const;
+    inline int hwIsoSum() const { return hwIsoSum_; };
+    inline int hwDPhiExtra() const { return hwDPhiExtra_; };
+    inline int hwDEtaExtra() const { return hwDEtaExtra_; };
+    inline int hwRank() const { return hwRank_; };
 
-    bool debug() const;
+    inline bool debug() const { return debug_; };
 
   private:
 
@@ -93,6 +111,11 @@ namespace l1t {
     int hwDEtaExtra_;
     int hwRank_;
 
+    // muon coordinates at the vertex
+    int hwEtaAtVtx_;
+    int hwPhiAtVtx_;
+    double etaAtVtx_;
+    double phiAtVtx_;
   };
 
 }

DataFormats/L1Trigger/src/Muon.cc

@@ -10,7 +10,11 @@ l1t::Muon::Muon()
     hwIsoSum_(0),
     hwDPhiExtra_(0),
     hwDEtaExtra_(0),
-    hwRank_(0)
+    hwRank_(0),
+    hwEtaAtVtx_(0),
+    hwPhiAtVtx_(0),
+    etaAtVtx_(0.),
+    phiAtVtx_(0.)
 {
 
 }
@@ -29,7 +33,11 @@ l1t::Muon::Muon( const LorentzVector& p4,
     int isoSum,
     int dPhi,
     int dEta,
-    int rank )
+    int rank,
+    int hwEtaAtVtx,
+    int hwPhiAtVtx,
+    double etaAtVtx,
+    double phiAtVtx)
   : L1Candidate(p4, pt, eta, phi, qual, iso),
     hwCharge_(charge),
     hwChargeValid_(chargeValid),
@@ -39,7 +47,11 @@ l1t::Muon::Muon( const LorentzVector& p4,
     hwIsoSum_(isoSum),
     hwDPhiExtra_(dPhi),
     hwDEtaExtra_(dEta),
-    hwRank_(rank)
+    hwRank_(rank),
+    hwEtaAtVtx_(hwEtaAtVtx),
+    hwPhiAtVtx_(hwPhiAtVtx),
+    etaAtVtx_(etaAtVtx),
+    phiAtVtx_(phiAtVtx)
 {
 
 }
@@ -58,7 +70,11 @@ l1t::Muon::Muon( const PolarLorentzVector& p4,
     int isoSum,
     int dPhi,
     int dEta,
-    int rank )
+    int rank,
+    int hwEtaAtVtx,
+    int hwPhiAtVtx,
+    double etaAtVtx,
+    double phiAtVtx)
   : L1Candidate(p4, pt, eta, phi, qual, iso),
     hwCharge_(charge),
     hwChargeValid_(chargeValid),
@@ -68,7 +84,11 @@ l1t::Muon::Muon( const PolarLorentzVector& p4,
     hwIsoSum_(isoSum),
     hwDPhiExtra_(dPhi),
     hwDEtaExtra_(dEta),
-    hwRank_(rank)
+    hwRank_(rank),
+    hwEtaAtVtx_(hwEtaAtVtx),
+    hwPhiAtVtx_(hwPhiAtVtx),
+    etaAtVtx_(etaAtVtx),
+    phiAtVtx_(phiAtVtx)
 {
 
 }
@@ -78,110 +98,3 @@ l1t::Muon::~Muon()
 
 }
 
-void 
-l1t::Muon::setHwCharge(int charge)
-{
-  hwCharge_ = charge;
-}
-
-void 
-l1t::Muon::setHwChargeValid(int valid)
-{
-  hwChargeValid_ = valid;
-}
-
-void 
-l1t::Muon::setHwTag(int tag)
-{
-  hwTag_ = tag;
-}
-
-void 
-l1t::Muon::setTfMuonIndex(int index)
-{
-  tfMuonIndex_ = index;
-}
-
-void 
-l1t::Muon::setHwIsoSum(int isoSum) 
-{
-  hwIsoSum_ = isoSum;
-}
-
-void 
-l1t::Muon::setHwDPhiExtra(int dPhi)
-{
-  hwDPhiExtra_ = dPhi;
-}
-
-void 
-l1t::Muon::setHwDEtaExtra(int dEta) 
-{
-  hwDEtaExtra_ = dEta;
-}
-
-void 
-l1t::Muon::setHwRank(int rank) 
-{
-  hwRank_ = rank;
-}
-
-void
-l1t::Muon::setDebug(bool debug)
-{
-  debug_ = debug;
-}
-
-int 
-l1t::Muon::hwCharge() const
-{
-  return hwCharge_;
-}
-
-int 
-l1t::Muon::hwChargeValid() const
-{
-  return hwChargeValid_;
-}
-
-int 
-l1t::Muon::hwTag() const
-{
-  return hwTag_;
-}
-
-int 
-l1t::Muon::tfMuonIndex() const
-{
-  return tfMuonIndex_;
-}
-
-int 
-l1t::Muon::hwIsoSum() const 
-{
-  return hwIsoSum_;
-}
-
-int 
-l1t::Muon::hwDPhiExtra() const
-{
-  return hwDPhiExtra_;
-}
-
-int 
-l1t::Muon::hwDEtaExtra() const
-{
-  return hwDEtaExtra_;
-}
-
-int 
-l1t::Muon::hwRank() const
-{
-  return hwRank_;
-}
-
-bool
-l1t::Muon::debug() const
-{
-  return debug_;
-}

DataFormats/L1Trigger/src/classes_def.xml

@@ -80,7 +80,8 @@
   <class name="l1t::TauVectorRef"/>
   <class name="edm::Wrapper<l1t::TauVectorRef>"/>
 
-  <class name="l1t::Muon" ClassVersion="16">
+  <class name="l1t::Muon" ClassVersion="17">
+   <version ClassVersion="17" checksum="3946815604"/>
    <version ClassVersion="16" checksum="1302394108"/>
    <version ClassVersion="15" checksum="957467775"/>
    <version ClassVersion="14" checksum="1302394108"/>

EventFilter/L1TRawToDigi/plugins/implementations_stage2/CaloSetup.cc

@@ -76,6 +76,9 @@ namespace l1t {
          if (fw >= 0x10010010) {
             mp_unp = UnpackerFactory::get()->make("stage2::MPUnpacker_0x10010010");
          }
+         if (fw >= 0x10010033) {
+            mp_unp = UnpackerFactory::get()->make("stage2::MPUnpacker_0x10010033");
+         }
 
 
          UnpackerMap res;

EventFilter/L1TRawToDigi/plugins/implementations_stage2/GMTCollections.cc

@@ -2,14 +2,19 @@
 
 #include "GMTCollections.h"
 
+#include <string>
+
 namespace l1t {
    namespace stage2 {
       GMTCollections::~GMTCollections()
       {
          event_.put(std::move(regionalMuonCandsBMTF_), "BMTF");
          event_.put(std::move(regionalMuonCandsOMTF_), "OMTF");
          event_.put(std::move(regionalMuonCandsEMTF_), "EMTF");
-         event_.put(std::move(muons_), "Muon");
+         event_.put(std::move(muons_[0]), "Muon");
+         for (int i=1; i<6; ++i) {
+            event_.put(std::move(muons_[i]), ("MuonCopy"+std::to_string(i)).c_str());
+         }
          event_.put(std::move(imdMuonsBMTF_), "imdMuonsBMTF");
          event_.put(std::move(imdMuonsEMTFNeg_), "imdMuonsEMTFNeg");
          event_.put(std::move(imdMuonsEMTFPos_), "imdMuonsEMTFPos");

EventFilter/L1TRawToDigi/plugins/implementations_stage2/GMTCollections.h

@@ -7,28 +7,33 @@
 //#include "EventFilter/L1TRawToDigi/interface/UnpackerCollections.h"
 #include "L1TObjectCollections.h"
 
+#include <array>
+
 namespace l1t {
    namespace stage2 {
       class GMTCollections : public L1TObjectCollections {
          public:
             GMTCollections(edm::Event& e) :
                L1TObjectCollections(e),
-               regionalMuonCandsBMTF_(new RegionalMuonCandBxCollection()),
-               regionalMuonCandsOMTF_(new RegionalMuonCandBxCollection()),
-               regionalMuonCandsEMTF_(new RegionalMuonCandBxCollection()),
-               muons_(new MuonBxCollection()),
-               imdMuonsBMTF_(new MuonBxCollection()),
-               imdMuonsEMTFNeg_(new MuonBxCollection()),
-               imdMuonsEMTFPos_(new MuonBxCollection()),
-               imdMuonsOMTFNeg_(new MuonBxCollection()),
-               imdMuonsOMTFPos_(new MuonBxCollection()) {};
+               regionalMuonCandsBMTF_(std::make_unique<RegionalMuonCandBxCollection>()),
+               regionalMuonCandsOMTF_(std::make_unique<RegionalMuonCandBxCollection>()),
+               regionalMuonCandsEMTF_(std::make_unique<RegionalMuonCandBxCollection>()),
+               muons_(),
+               imdMuonsBMTF_(std::make_unique<MuonBxCollection>()),
+               imdMuonsEMTFNeg_(std::make_unique<MuonBxCollection>()),
+               imdMuonsEMTFPos_(std::make_unique<MuonBxCollection>()),
+               imdMuonsOMTFNeg_(std::make_unique<MuonBxCollection>()),
+               imdMuonsOMTFPos_(std::make_unique<MuonBxCollection>())
+            {
+               std::generate(muons_.begin(), muons_.end(), []{ return std::make_unique<MuonBxCollection>(); });
+            };
 
             virtual ~GMTCollections();
 
             inline RegionalMuonCandBxCollection* getRegionalMuonCandsBMTF() { return regionalMuonCandsBMTF_.get(); };
             inline RegionalMuonCandBxCollection* getRegionalMuonCandsOMTF() { return regionalMuonCandsOMTF_.get(); };
             inline RegionalMuonCandBxCollection* getRegionalMuonCandsEMTF() { return regionalMuonCandsEMTF_.get(); };
-            inline MuonBxCollection* getMuons() { return muons_.get(); };
+            inline MuonBxCollection* getMuons(const unsigned int copy) override { return muons_[copy].get(); };
             inline MuonBxCollection* getImdMuonsBMTF() { return imdMuonsBMTF_.get(); };
             inline MuonBxCollection* getImdMuonsEMTFNeg() { return imdMuonsEMTFNeg_.get(); };
             inline MuonBxCollection* getImdMuonsEMTFPos() { return imdMuonsEMTFPos_.get(); };
@@ -39,7 +44,7 @@ namespace l1t {
             std::unique_ptr<RegionalMuonCandBxCollection> regionalMuonCandsBMTF_;
             std::unique_ptr<RegionalMuonCandBxCollection> regionalMuonCandsOMTF_;
             std::unique_ptr<RegionalMuonCandBxCollection> regionalMuonCandsEMTF_;
-            std::unique_ptr<MuonBxCollection> muons_;
+            std::array<std::unique_ptr<MuonBxCollection>, 6> muons_;
             std::unique_ptr<MuonBxCollection> imdMuonsBMTF_;
             std::unique_ptr<MuonBxCollection> imdMuonsEMTFNeg_;
             std::unique_ptr<MuonBxCollection> imdMuonsEMTFPos_;