Scouting Phase 2 - Inclusion of PF and TTracks

DataFormats/L1TParticleFlow/interface/L1ScoutingPF.h

@@ -0,0 +1,90 @@
+#ifndef DataFormats_L1TParticleFlow_L1ScoutingPF_h
+#define DataFormats_L1TParticleFlow_L1ScoutingPF_h
+
+#include <vector>
+#include <utility>
+#include <cstdint>
+#include <Math/Vector4D.h>
+
+namespace l1Scouting {
+  class PF {
+  public:
+    PF() {}
+    PF(float pt, float eta, float phi, uint8_t pid, float z0, float dxy, float pfw, uint8_t quality)
+        : pt_(pt), eta_(eta), phi_(phi), z0_(z0), dxy_(dxy), pfw_(pfw), pid_(pid), quality_(quality) {}
+    PF(float pt, float eta, float phi, uint8_t pid, float z0, float dxy, uint8_t quality)
+        : pt_(pt), eta_(eta), phi_(phi), z0_(z0), dxy_(dxy), pfw_(1.0f), pid_(pid), quality_(quality) {}
+    PF(float pt, float eta, float phi, uint8_t pid, float pfw, uint8_t quality)
+        : pt_(pt), eta_(eta), phi_(phi), z0_(0.0f), dxy_(0.0f), pfw_(pfw), pid_(pid), quality_(quality) {}
+
+    float pt() const { return pt_; }
+    float eta() const { return eta_; }
+    float phi() const { return phi_; }
+    float z0() const { return z0_; }
+    float dxy() const { return dxy_; }
+    float pfw() const { return pfw_; }
+    uint8_t pid() const { return pid_; }
+    int16_t pdgId() const { return PDGID_[pid_]; }
+    uint8_t quality() const { return quality_; }
+    float mass() const { return MASS_[pid_]; }
+    int charge() const { return (pid_ < 2) ? 0 : (2 * (pid_ & 1) - 1); }
+
+    void setPt(float pt) { pt_ = pt; }
+    void setEta(float eta) { eta_ = eta; }
+    void setPhi(float phi) { phi_ = phi; }
+    void setZ0(float z0) { z0_ = z0; }
+    void setDxy(float dxy) { dxy_ = dxy; }
+    void setPFw(float pfw) { pfw_ = pfw; }
+    void setPid(int8_t pid) { pid_ = pid; }
+    void setQuality(uint8_t quality) { quality_ = quality; }
+
+    ROOT::Math::PtEtaPhiMVector p4() const { return ROOT::Math::PtEtaPhiMVector(pt_, eta_, phi_, mass()); }
+
+    enum PIDs {
+      HadZero = 0,
+      Gamma = 1,
+      HadMinus = 2,
+      HadPlus = 3,
+      EleMinus = 4,
+      ElePlus = 5,
+      MuMinus = 6,
+      MuPlus = 7,
+      nPIDs = 8
+    };
+
+  private:
+    float pt_, eta_, phi_, z0_, dxy_, pfw_;
+    uint8_t pid_, quality_;
+
+    static constexpr int16_t PDGID_[nPIDs] = {130, 22, -211, 211, 11, -11, 13, -13};
+    static constexpr float MASS_[nPIDs] = {0.5, 0.0, 0.13, 0.13, 0.0005, 0.0005, 0.105, 0.105};
+  };
+
+  struct PFSOA {
+    std::vector<uint16_t> bx;
+    std::vector<uint32_t> offsets;
+    std::vector<float> pt, eta, phi, z0, dxy, pfw;
+    std::vector<int16_t> pdgId;
+    std::vector<uint8_t> quality;
+    PFSOA() : bx(), offsets(), pt(), eta(), phi(), z0(), dxy(), pfw(), pdgId(), quality() {}
+    PFSOA(const PFSOA& other) = default;
+    PFSOA(PFSOA&& other) = default;
+    PFSOA& operator=(const PFSOA& other) = default;
+    PFSOA& operator=(PFSOA&& other) = default;
+    void swap(PFSOA& other) {
+      using std::swap;
+      swap(bx, other.bx);
+      swap(offsets, other.offsets);
+      swap(pt, other.pt);
+      swap(eta, other.eta);
+      swap(phi, other.phi);
+      swap(z0, other.z0);
+      swap(dxy, other.dxy);
+      swap(pfw, other.pfw);
+      swap(pdgId, other.pdgId);
+      swap(quality, other.quality);
+    }
+  };
+  inline void swap(PFSOA& a, PFSOA& b) { a.swap(b); }
+}  // namespace l1Scouting
+#endif

DataFormats/L1TParticleFlow/interface/L1ScoutingTTrack.h

@@ -0,0 +1,48 @@
+#ifndef DataFormats_L1TParticleFlow_TTrack_h
+#define DataFormats_L1TParticleFlow_TTrack_h
+
+#include <algorithm>
+#include <array>
+#include <bitset>
+#include <cmath>
+#include <limits>
+#include <string>
+#include <vector>
+
+namespace l1Scouting {
+  class TTrack {
+  public:
+    TTrack() {}
+    TTrack(float pt, float eta, float phi, float z0, float dxy, float mvaQuality, uint8_t nStub, uint8_t quality, int8_t charge)
+         : pt_(pt), eta_(eta), phi_(phi), z0_(z0), dxy_(dxy), mvaQuality_(mvaQuality), nStub_(nStub), quality_(quality), charge_(charge) {}
+
+    float pt() const { return pt_; }
+    float eta() const { return eta_; }
+    float phi() const { return phi_; }
+    float z0() const { return z0_; }
+    float dxy() const { return dxy_; }
+    float mvaQuality() const { return mvaQuality_; }
+    uint8_t nStub() const { return nStub_; }
+    uint8_t quality() const { return quality_; }
+    int8_t charge() const { return charge_; }
+
+  private:
+    float pt_, eta_, phi_, z0_, dxy_, mvaQuality_;
+    uint8_t nStub_, quality_;
+    int8_t charge_;
+  };
+
+  struct TTrackSOA {
+    std::vector<uint16_t> bx;
+    std::vector<uint32_t> offsets;
+    std::vector<float> pt, eta, phi, z0, dxy, mvaQuality;
+    std::vector<uint8_t> nStub, quality;
+    std::vector<int8_t> charge;
+    TTrackSOA() : bx(), offsets(), pt(), eta(), phi(), z0(), dxy(), mvaQuality(), nStub(), quality(), charge() {}
+    TTrackSOA(const TTrackSOA& other) = default;
+    TTrackSOA(TTrackSOA&& other) = default;
+    TTrackSOA& operator=(const TTrackSOA& other) = default;
+    TTrackSOA& operator=(TTrackSOA&& other) = default;
+  };
+};
+#endif

DataFormats/L1TParticleFlow/interface/L1ScoutingTkEm.h

@@ -50,5 +50,19 @@ namespace l1Scouting {
     float z0_;
   };
 
+  class IsoTkEm : public TkEm {
+    public:
+      IsoTkEm() {}
+      IsoTkEm(float pt, float eta, float phi, uint8_t quality, float isolation, int8_t id)
+          : TkEm(pt, eta, phi, quality, isolation), id_(id){}
+
+      int8_t id() const { return id_; }
+
+      void setId(int8_t id) { id_ = id; }
+
+    private:
+      int8_t id_;
+    };
+
 }  // namespace l1Scouting
 #endif

DataFormats/L1TParticleFlow/interface/RecMeson.h

@@ -0,0 +1,51 @@
+#ifndef DataFormats_L1TParticleFlow_RecMeson_h
+#define DataFormats_L1TParticleFlow_RecMeson_h
+
+#include <vector>
+#include <utility>
+#include <cstdint>
+#include <Math/Vector4D.h>
+
+namespace l1Scouting {
+  class RecMeson {
+  public:
+    RecMeson() {}
+    RecMeson(float pt, float eta, float phi, float mass, int charge, float dmass1, float dmass2, int pdgId, int id1, int id2, float isoDR0p25)
+      : pt_(pt), eta_(eta), phi_(phi), mass_(mass), charge_(charge), dmass1_(dmass1), dmass2_(dmass2), pdgId_(pdgId), id1_(id1), id2_(id2), isoDR0p25_(isoDR0p25) {}
+
+    float pt() const { return pt_; }
+    float eta() const { return eta_; }
+    float phi() const { return phi_; }
+    float mass() const { return mass_; }
+    int charge() const { return charge_; }
+    float dmass1() const { return dmass1_; }
+    float dmass2() const { return dmass2_; }
+    int pdgId() const { return pdgId_; }
+    int id1() const { return id1_; }
+    int id2() const { return id2_; }
+    float isoDR0p25() const { return isoDR0p25_; }
+    ROOT::Math::PtEtaPhiMVector p4() const { return ROOT::Math::PtEtaPhiMVector(pt_, eta_, phi_, mass()); }
+
+    void setPt(float pt) { pt_ = pt; }
+    void setEta(float eta) { eta_ = eta; }
+    void setPhi(float phi) { phi_ = phi; }
+    void setMass(float mass) { mass_ = mass; }
+    void setCharge(int charge) { charge_ = charge; }
+    void setDmass1(float dmass1) { dmass1_ = dmass1; }
+    void setDmass2(float dmass2) { dmass2_ = dmass2; }
+    void setPdgId(int pdgId) { pdgId_ = pdgId; }
+    void setId1(int id1) { id1_ = id1; }
+    void setId2(int id2) { id2_ = id2; }
+    void setIsoDR0p25(float isoDR0p25) { isoDR0p25_ = isoDR0p25; }
+
+
+  private:
+    float pt_, eta_, phi_, mass_;
+    int charge_;
+    float dmass1_, dmass2_;
+    int pdgId_;
+    int id1_, id2_;
+    float isoDR0p25_;
+  };
+}  // namespace l1Scouting
+#endif

DataFormats/L1TParticleFlow/src/L1ScoutingPF.cc

@@ -0,0 +1 @@
+#include "DataFormats/L1TParticleFlow/interface/L1ScoutingPF.h"

DataFormats/L1TParticleFlow/src/L1ScoutingTTrack.cc

@@ -0,0 +1 @@
+#include "DataFormats/L1TParticleFlow/interface/L1ScoutingTTrack.h"

DataFormats/L1TParticleFlow/src/RecMeson.cc

@@ -0,0 +1 @@
+#include "DataFormats/L1TParticleFlow/interface/RecMeson.h"

DataFormats/L1TParticleFlow/src/classes.h

@@ -8,6 +8,9 @@
 #include "DataFormats/L1TParticleFlow/interface/PFTau.h"
 #include "DataFormats/L1TParticleFlow/interface/HPSPFTau.h"
 #include "DataFormats/L1TParticleFlow/interface/HPSPFTauFwd.h"
+#include "DataFormats/L1TParticleFlow/interface/RecMeson.h"
 #include "DataFormats/L1TParticleFlow/interface/L1ScoutingPuppi.h"
+// #include "DataFormats/L1TParticleFlow/interface/L1ScoutingPF.h"
 #include "DataFormats/L1TParticleFlow/interface/L1ScoutingTkEm.h"
-#include "DataFormats/L1Scouting/interface/OrbitCollection.h"
+#include "DataFormats/L1TParticleFlow/interface/L1ScoutingTTrack.h"
+#include "DataFormats/L1Scouting/interface/OrbitCollection.h"

DataFormats/L1TParticleFlow/src/classes_def.xml

@@ -1,13 +1,13 @@
 <lcgdict>
-                      
+
   <class name="l1t::PFCluster" ClassVersion="4">
    <version ClassVersion="4" checksum="3917005656"/>
         <version ClassVersion="3" checksum="1668592434"/>
-  </class> 
+  </class>
   <class name="l1t::PFClusterCollection"/>
   <class name="edm::Wrapper<l1t::PFClusterCollection>" />
   <class name="edm::Ref<l1t::PFClusterCollection>" />
-  <class name="edm::RefVector<l1t::PFClusterCollection>" /> 
+  <class name="edm::RefVector<l1t::PFClusterCollection>" />
 
   <class name="l1t::PFTrack::TrackRef" />
   <class name="l1t::PFTrack"  ClassVersion="4">
@@ -17,9 +17,14 @@
   <class name="l1t::PFTrackCollection" />
   <class name="edm::Wrapper<l1t::PFTrackCollection>" />
   <class name="edm::Ref<l1t::PFTrackCollection>" />
-  <class name="edm::RefVector<l1t::PFTrackCollection>" /> 
+  <class name="edm::RefVector<l1t::PFTrackCollection>" />
   <class name="std::vector<edm::Ref<l1t::PFTrackCollection> >" />
 
+  <class name="l1Scouting::RecMeson" />
+  <class name="std::vector<l1Scouting::RecMeson>"/>
+  <class name="OrbitCollection<l1Scouting::RecMeson>" />
+  <class name="edm::Wrapper<OrbitCollection<l1Scouting::RecMeson>>" />
+
   <class name="l1t::PFCandidate"  ClassVersion="7">
         <version ClassVersion="7" checksum="2118795037"/>
         <version ClassVersion="6" checksum="2195440462"/>
@@ -36,6 +41,7 @@
   <class name="edm::Wrapper<l1t::RegionalOutput<l1t::PFCandidateCollection>>" />
   <class name="OrbitCollection<l1t::PFCandidate>" />
   <class name="edm::Wrapper<OrbitCollection<l1t::PFCandidate>>" />
+
   <class name="l1Scouting::Puppi"  ClassVersion="3">
         <version ClassVersion="3" checksum="3223900940"/>
   </class>
@@ -59,6 +65,22 @@
   <class name="OrbitCollection<l1Scouting::TkEle>" />
   <class name="edm::Wrapper<OrbitCollection<l1Scouting::TkEle>>" />
 
+  <class name="l1Scouting::IsoTkEm"  ClassVersion="3">
+	<version ClassVersion="3" checksum="39808717"/>
+  </class>
+  <class name="std::vector<l1Scouting::IsoTkEm>" />
+  <class name="OrbitCollection<l1Scouting::IsoTkEm>" />
+  <class name="edm::Wrapper<OrbitCollection<l1Scouting::IsoTkEm>>" />
+
+  <class name="l1Scouting::TTrack"  ClassVersion="3">
+        <version ClassVersion="3" checksum="2404234549"/>
+  </class>
+  <class name="std::vector<l1Scouting::TTrack>" />
+  <class name="OrbitCollection<l1Scouting::TTrack>" />
+  <class name="edm::Wrapper<OrbitCollection<l1Scouting::TTrack>>" />
+  <class name="l1Scouting::TTrackSOA" />
+  <class name="edm::Wrapper<l1Scouting::TTrackSOA>" />
+
   <class name="l1t::PFJet"  ClassVersion="6">
         <version ClassVersion="6" checksum="2599349078"/>
         <version ClassVersion="5" checksum="2270932343"/>
@@ -78,9 +100,9 @@
   </class>
   <class name="l1t::PFTauCollection" />
   <class name="edm::Wrapper<l1t::PFTauCollection>" />
-  <class name="edm::Ref<l1t::PFTauCollection>" /> 
-  <class name="edm::RefVector<l1t::PFTauCollection>" /> 
-  <class name="std::vector<edm::Ref<l1t::PFTauCollection> >" /> 
+  <class name="edm::Ref<l1t::PFTauCollection>" />
+  <class name="edm::RefVector<l1t::PFTauCollection>" />
+  <class name="std::vector<edm::Ref<l1t::PFTauCollection> >" />
 
   <class name="l1t::HPSPFTau" ClassVersion="14">
     <version ClassVersion="14" checksum="927489833"/>
@@ -91,7 +113,7 @@
   <class name="l1t::HPSPFTauCollection"/>
   <class name="edm::Wrapper<l1t::HPSPFTauCollection>"/>
   <class name="edm::Ref<l1t::HPSPFTauCollection>" />
-  <class name="edm::RefVector<l1t::HPSPFTauCollection>" /> 
+  <class name="edm::RefVector<l1t::HPSPFTauCollection>" />
   <class name="std::vector<edm::Ref<l1t::HPSPFTauCollection> >" />
 
 </lcgdict>

L1TriggerScouting/Phase2/BuildFile.xml

@@ -1,8 +1,10 @@
 <use name="FWCore/Framework"/>
 <use name="EventFilter/Utilities"/>
+<use name="DataFormats/CLHEP"/>
 <use name="DataFormats/L1Scouting"/>
 <use name="DataFormats/L1Trigger"/>
 <use name="DataFormats/L1TParticleFlow"/>
+<use name="DataFormats/L1TrackTrigger"/>
 <use name="rootvecops"/>
 <export>
   <lib name="1"/>