[Phase2 L1T] GMT Upgrade of Kalman Filter for Barrel Muon KMTF

DataFormats/L1DTTrackFinder/BuildFile.xml

@@ -3,4 +3,5 @@
 <use name="DataFormats/L1GlobalMuonTrigger"/>
 <export>
   <lib name="1"/>
+  <lib name="DataFormatsL1DTTrackFinder"/>
 </export>

DataFormats/L1TMuonPhase2/interface/KMTFTrack.h

@@ -10,30 +10,40 @@ namespace l1t {
   class KMTFTrack;
   typedef std::vector<KMTFTrack> KMTFTrackCollection;
   typedef BXVector<KMTFTrack> KMTFTrackBxCollection;
+  typedef math::Error<5>::type CovarianceMatrix5dim;
+  typedef math::Error<2>::type CovarianceMatrix2dim;
 
   class KMTFTrack : public reco::LeafCandidate {
   public:
     KMTFTrack()
         : reco::LeafCandidate(-1, reco::LeafCandidate::PolarLorentzVector(0.1, 0.0, 0.0, 0.105)),
           unconstrainedP4_(reco::LeafCandidate::PolarLorentzVector(0.1, 0.0, 0.0, 0.105)),
-          covariance_(std::vector<double>(6, 0.0)),
+          covariance_(std::vector<double>(15, 0.0)),
+          covarianceNB_(std::vector<double>(3, 0.0)),
           curvVertex_(0),
           ptC_(0),
           phiVertex_(0),
           dxy_(0),
+          zVertex_(0),
+          kSlopeVertex_(0),
           curvMuon_(0),
           ptU_(0),
           phiMuon_(0),
           phiBMuon_(0),
+          zMuon_(0),
+          kSlopeMuon_(0),
           curv_(0),
           phi_(0),
           phiB_(0),
+          z_(0),
+          kSlope_(0),
           coarseEta_(0),
           approxPromptChi2_(0),
           approxPromptErrChi2_(0),
           approxDispChi2_(0),
           approxDispErrChi2_(0),
           hitPattern_(0),
+          thetaDigiPattern_(0),
           step_(1),
           sector_(0),
           wheel_(0),
@@ -46,27 +56,35 @@ namespace l1t {
 
     ~KMTFTrack() override = default;
 
-    KMTFTrack(const l1t::MuonStubRef& seed, int phi, int phiB)
+    KMTFTrack(const l1t::MuonStubRef& seed, int phi, int phiB, int z, int kSlope)
         : reco::LeafCandidate(-1, reco::LeafCandidate::PolarLorentzVector(0.1, 0.0, 0.0, 0.105)),
           unconstrainedP4_(reco::LeafCandidate::PolarLorentzVector(0.1, 0.0, 0.0, 0.105)),
-          covariance_(std::vector<double>(6, 0.0)),
+          covariance_(std::vector<double>(15, 0.0)),
+          covarianceNB_(std::vector<double>(3, 0.0)),
           curvVertex_(0),
           ptC_(0),
           phiVertex_(0),
           dxy_(0),
+          zVertex_(0),
+          kSlopeVertex_(0),
           curvMuon_(0),
           ptU_(0),
           phiMuon_(0),
           phiBMuon_(0),
+          zMuon_(0),
+          kSlopeMuon_(0),
           curv_(0),
           phi_(phi),
           phiB_(phiB),
+          z_(z),
+          kSlope_(kSlope),
           coarseEta_(0),
           approxPromptChi2_(0),
           approxPromptErrChi2_(0),
           approxDispChi2_(0),
           approxDispErrChi2_(0),
           hitPattern_(0),
+          thetaDigiPattern_(0),
           step_(seed->depthRegion()),
           sector_(seed->phiRegion()),
           wheel_(seed->etaRegion()),
@@ -80,6 +98,7 @@ namespace l1t {
       residuals_.push_back(0);
       residuals_.push_back(0);
       residuals_.push_back(0);
+      residuals_.push_back(0);
     }
 
     reco::LeafCandidate::PolarLorentzVector displacedP4() const { return unconstrainedP4_; }
@@ -92,13 +111,21 @@ namespace l1t {
     int phiAtMuon() const { return phiMuon_; }
     //unconstrained phiB at station 1
     int phiBAtMuon() const { return phiBMuon_; }
+    //unconstrained z at station 1
+    int zAtMuon() const { return zMuon_; }
+    //unconstrained kSLope at station 1
+    int kSlopeAtMuon() const { return kSlopeMuon_; }
 
     //constrained pt
     int ptPrompt() const { return ptC_; }
     //Constrained curvature at vertex
     int curvatureAtVertex() const { return curvVertex_; }
     //constrained phi at the vertex
     int phiAtVertex() const { return phiVertex_; }
+    //constrained z at the vertex
+    int zAtVertex() const { return zVertex_; }
+    //constrained kSlope at the vertex
+    int kSlopeAtVertex() const { return kSlopeVertex_; }
     //Impact parameter as calculated from the muon track
     int dxy() const { return dxy_; }
     //Unconstrained curvature at the Muon systen
@@ -107,6 +134,10 @@ namespace l1t {
     int positionAngle() const { return phi_; }
     //Unconstrained bending angle at the Muon systen
     int bendingAngle() const { return phiB_; }
+
+    //global z and slope of stub
+    int zPosition() const { return z_; }
+    int kSlope() const { return kSlope_; }
     //Coarse eta caluclated only using phi segments
     int coarseEta() const { return coarseEta_; }
     //Approximate Chi2 metrics
@@ -116,6 +147,7 @@ namespace l1t {
     int approxDispErrChi2() const { return approxDispErrChi2_; }
 
     int hitPattern() const { return hitPattern_; }
+    int thetaDigiPattern() const { return thetaDigiPattern_; }
     //step;
     int step() const { return step_; }
     //sector;
@@ -156,8 +188,37 @@ namespace l1t {
       return kalmanGain0_;
     }
 
+    const std::vector<float>& ThetaGain1D(unsigned int step) const {
+      switch (step) {
+        case 3:
+          return ThetaGain1D3_;
+        case 2:
+          return ThetaGain1D2_;
+        case 1:
+          return ThetaGain1D1_;
+        case 0:
+          return ThetaGain1D0_;
+      }
+      return ThetaGain1D0_;
+    }
+
+    const std::vector<float>& ThetaGain(unsigned int step) const {
+      switch (step) {
+        case 3:
+          return ThetaGain3_;
+        case 2:
+          return ThetaGain2_;
+        case 1:
+          return ThetaGain1_;
+        case 0:
+          return ThetaGain0_;
+      }
+      return ThetaGain0_;
+    }
+
     //get covariance
     const std::vector<double>& covariance() const { return covariance_; }
+    const std::vector<double>& covarianceNB() const { return covarianceNB_; }
 
     //get residual
     int residual(uint i) const { return residuals_[i]; }
@@ -188,23 +249,29 @@ namespace l1t {
     }
 
     //Set coordinates general
-    void setCoordinates(int step, int curv, int phi, int phiB) {
+    void setCoordinates(int step, int curv, int phi, int phiB, int z, int kSlope) {
       step_ = step;
       curv_ = curv;
       phiB_ = phiB;
       phi_ = phi;
+      z_ = z;
+      kSlope_ = kSlope;
     }
 
-    void setCoordinatesAtVertex(int curv, int phi, int dxy) {
+    void setCoordinatesAtVertex(int curv, int phi, int dxy, int z, int kSlope) {
       curvVertex_ = curv;
       phiVertex_ = phi;
       dxy_ = dxy;
+      zVertex_ = z;
+      kSlopeVertex_ = kSlope;
     }
 
-    void setCoordinatesAtMuon(int curv, int phi, int phiB) {
+    void setCoordinatesAtMuon(int curv, int phi, int phiB, int z, int kSlope) {
       curvMuon_ = curv;
       phiMuon_ = phi;
       phiBMuon_ = phiB;
+      zMuon_ = z;
+      kSlopeMuon_ = kSlope;
     }
 
     void setPt(int ptC, int ptU) {
@@ -215,6 +282,7 @@ namespace l1t {
     void setCoarseEta(int eta) { coarseEta_ = eta; }
 
     void setHitPattern(int pattern) { hitPattern_ = pattern; }
+    void setThetaDigiPattern(int theta_pattern) { thetaDigiPattern_ = theta_pattern; }
 
     void setApproxChi2(int chi, int chiErr, bool prompt) {
       if (prompt) {
@@ -305,14 +373,101 @@ namespace l1t {
       }
     }
 
+    void setThetaGain1D(unsigned int step,
+                        unsigned int K,
+                        int priorThetaPattern,
+                        int seedStation,
+                        int priorPhiPattern,
+                        float G31,
+                        float G32,
+                        float G41,
+                        float G42) {
+      std::vector<float>* v1 = nullptr;
+      switch (step) {
+        case 3:
+          v1 = &ThetaGain1D3_;
+          break;
+        case 2:
+          v1 = &ThetaGain1D2_;
+          break;
+        case 1:
+          v1 = &ThetaGain1D1_;
+          break;
+        case 0:
+          v1 = &ThetaGain1D0_;
+          break;
+        default:
+          throw cms::Exception("WrongCondition") << "1D: Critical ERROR on setting the Theta gain\n";
+      }
+      v1->push_back(static_cast<float>(K));
+      v1->push_back(static_cast<float>(priorThetaPattern));
+      v1->push_back(static_cast<float>(seedStation));
+      v1->push_back(static_cast<float>(priorPhiPattern));
+      v1->push_back(G31);
+      v1->push_back(G32);
+      v1->push_back(G41);
+      v1->push_back(G42);
+    }
+
+    void setThetaGain(unsigned int step,
+                      unsigned int K,
+                      int priorThetaPattern,
+                      int seedStation,
+                      int priorPhiPattern,
+                      float G32,
+                      float G33,
+                      float G42,
+                      float G43) {
+      std::vector<float>* v2 = nullptr;
+      switch (step) {
+        case 3:
+          v2 = &ThetaGain3_;
+          break;
+        case 2:
+          v2 = &ThetaGain2_;
+          break;
+        case 1:
+          v2 = &ThetaGain1_;
+          break;
+        case 0:
+          v2 = &ThetaGain0_;
+          break;
+        default:
+          throw cms::Exception("WrongCondition") << "Critical ERROR on setting the Theta gain\n";
+      }
+      v2->push_back(static_cast<float>(K));
+      v2->push_back(static_cast<float>(priorThetaPattern));
+      v2->push_back(static_cast<float>(seedStation));
+      v2->push_back(static_cast<float>(priorPhiPattern));
+      v2->push_back(G32);
+      v2->push_back(G33);
+      v2->push_back(G42);
+      v2->push_back(G43);
+    }
+
     //set covariance
-    void setCovariance(const CovarianceMatrix& c) {
+    void setCovariance(const CovarianceMatrix5dim& c) {
       covariance_[0] = c(0, 0);
       covariance_[1] = c(0, 1);
       covariance_[2] = c(1, 1);
       covariance_[3] = c(0, 2);
       covariance_[4] = c(1, 2);
       covariance_[5] = c(2, 2);
+      covariance_[6] = c(0, 3);
+      covariance_[7] = c(1, 3);
+      covariance_[8] = c(2, 3);
+      covariance_[9] = c(3, 3);
+      covariance_[10] = c(0, 4);
+      covariance_[11] = c(1, 4);
+      covariance_[12] = c(2, 4);
+      covariance_[13] = c(3, 4);
+      covariance_[14] = c(4, 4);
+    }
+
+    void setCovarianceNB(const CovarianceMatrix2dim& c) {
+      covarianceNB_[0] = c(0, 0);
+      covarianceNB_[1] = c(0, 1);
+      covarianceNB_[2] = c(1, 1);
     }
 
     //set fine eta
@@ -329,24 +484,31 @@ namespace l1t {
 
     //Covariance matrix for studies
     std::vector<double> covariance_;
+    std::vector<double> covarianceNB_;
     l1t::MuonStubRefVector stubs_;
 
     //vertex coordinates
     int curvVertex_;
     int ptC_;
     int phiVertex_;
     int dxy_;
+    int zVertex_;
+    int kSlopeVertex_;
 
     //muon coordinates
     int curvMuon_;
     int ptU_;
     int phiMuon_;
     int phiBMuon_;
+    int zMuon_;
+    int kSlopeMuon_;
 
     //generic coordinates
     int curv_;
     int phi_;
     int phiB_;
+    int z_;
+    int kSlope_;
     //common coordinates
     int coarseEta_;
 
@@ -358,6 +520,8 @@ namespace l1t {
 
     //phi bitmask
     int hitPattern_;
+    //bitmask pattern based on theta digi presence
+    int thetaDigiPattern_;
 
     //propagation step
     int step_;
@@ -393,6 +557,16 @@ namespace l1t {
     std::vector<float> kalmanGain3_;
 
     std::vector<int> residuals_;
+
+    std::vector<float> ThetaGain1D0_;
+    std::vector<float> ThetaGain1D1_;
+    std::vector<float> ThetaGain1D2_;
+    std::vector<float> ThetaGain1D3_;
+
+    std::vector<float> ThetaGain0_;
+    std::vector<float> ThetaGain1_;
+    std::vector<float> ThetaGain2_;
+    std::vector<float> ThetaGain3_;
   };
 
 }  // namespace l1t

DataFormats/L1TMuonPhase2/src/classes_def.xml

@@ -22,7 +22,9 @@
      <class name="edm::Wrapper<std::vector<l1t::io_v1::SAMuon>>"/>
      <class name="edm::Ref<l1t::SAMuonCollection>" splitLevel="0"/>
 
-   <class name="l1t::KMTFTrack" ClassVersion="3">
+   <class name="l1t::KMTFTrack" ClassVersion="5">
+    <version ClassVersion="5" checksum="2306202566"/>
+    <version ClassVersion="4" checksum="251130338"/>
     <version ClassVersion="3" checksum="754125433"/>
    </class>
    <class name="std::vector<l1t::KMTFTrack>"/>