Approx cal for Tracklet Calculator Displaced (#52)

* Update TrackletCalculatorDisplaced.h * Update TrackletCalculatorDisplaced.cc * Fixed code formatting issues. * Fixed code formatting issues. * Updated TCD with changes suggested by Andrew * Update TrackletCalculatorDisplaced.cc Removed is Finite * Cleaned up some of the debug statements. Co-authored-by: Andrew Hart <ahart@cern.ch>
jpata · Dec 22, 2020 · 99af789 · 99af789
1 parent 999f615
commit 99af789
Show file tree

Hide file tree

Showing 6 changed files with 504 additions and 96 deletions.
diff --git a/L1Trigger/TrackFindingTracklet/interface/TrackletCalculatorDisplaced.h b/L1Trigger/TrackFindingTracklet/interface/TrackletCalculatorDisplaced.h
@@ -104,6 +104,57 @@ namespace trklet {
                        double phiderdisk[N_DISK],
                        double rderdisk[N_DISK]);
 
+    void approxproj(double halfRinv,
+                    double phi0,
+                    double d0,
+                    double t,
+                    double z0,
+                    double halfRinv_0,
+                    double d0_0,  // zeroeth order result for higher order terms calculation
+                    double rmean,
+                    double& phiproj,
+                    double& phiprojder,
+                    double& zproj,
+                    double& zprojder);
+
+    void approxprojdisk(double halfRinv,
+                        double phi0,
+                        double d0,
+                        double t,
+                        double z0,
+                        double halfRinv_0,
+                        double d0_0,  // zeroeth order result for higher order terms calculation
+                        double zmean,
+                        double& phiproj,
+                        double& phiprojder,
+                        double& rproj,
+                        double& rprojder);
+
+    void approxtracklet(double r1,
+                        double z1,
+                        double phi1,
+                        double r2,
+                        double z2,
+                        double phi2,
+                        double r3,
+                        double z3,
+                        double phi3,
+                        bool take3,
+                        unsigned ndisks,
+                        double& rinv,
+                        double& phi0,
+                        double& d0,
+                        double& t,
+                        double& z0,
+                        double phiproj[4],
+                        double zproj[4],
+                        double phider[4],
+                        double zder[4],
+                        double phiprojdisk[5],
+                        double rprojdisk[5],
+                        double phiderdisk[5],
+                        double rderdisk[5]);
+
   private:
     int TCIndex_;
     int layer_;
@@ -112,6 +163,7 @@ namespace trklet {
     int lproj_[N_LAYER - 2];
     double zproj_[N_DISK - 2];
     int dproj_[N_DISK - 2];
+    double rzmeanInv_[N_DISK - 2];
 
     std::vector<double> toR_;
     std::vector<double> toZ_;

diff --git a/L1Trigger/TrackFindingTracklet/plugins/L1FPGATrackProducer.cc b/L1Trigger/TrackFindingTracklet/plugins/L1FPGATrackProducer.cc
@@ -295,7 +295,7 @@ L1FPGATrackProducer::L1FPGATrackProducer(edm::ParameterSet const& iConfig)
   trackQuality_ = iConfig.getParameter<bool>("TrackQuality");
   if (trackQuality_) {
     trackQualityParams = iConfig.getParameter<edm::ParameterSet>("TrackQualityPSet");
-    trackQualityModel.reset(new TrackQuality(trackQualityParams));
+    trackQualityModel = std::make_unique<TrackQuality>(trackQualityParams);
   }
 }