Propagate to plane / Kalman on plane / Matriplex with support for scalar operations and VDT

RecoTracker/MkFitCMS/interface/MkStdSeqs.h

@@ -4,6 +4,7 @@
 #include "RecoTracker/MkFitCore/interface/Config.h"
 #include "RecoTracker/MkFitCore/interface/Hit.h"
 #include "RecoTracker/MkFitCore/interface/Track.h"
+#include "RecoTracker/MkFitCore/interface/DeadRegion.h"
 #include "RecoTracker/MkFitCore/interface/TrackerInfo.h"
 
 namespace mkfit {

RecoTracker/MkFitCMS/standalone/Shell.h

@@ -3,6 +3,7 @@
 
 #include "RecoTracker/MkFitCore/interface/Hit.h"
 #include "RecoTracker/MkFitCore/interface/Track.h"
+#include "RecoTracker/MkFitCore/interface/DeadRegion.h"
 
 #include <map>
 

RecoTracker/MkFitCMS/standalone/mkFit.cc

@@ -41,11 +41,6 @@ using namespace mkfit;
 
 //==============================================================================
 
-namespace mkfit::internal {
-  // Filled in geometry plugin.
-  std::vector<DeadVec> deadvectors;
-}  // namespace mkfit::internal
-
 void initGeom() {
   std::cout << "Constructing geometry '" << Config::geomPlugin << "'\n";
 

RecoTracker/MkFitCore/interface/BeamSpot.h

@@ -0,0 +1,17 @@
+#ifndef RecoTracker_MkFitCore_interface_BeamSpot_h
+#define RecoTracker_MkFitCore_interface_BeamSpot_h
+
+namespace mkfit {
+  struct BeamSpot {
+    float x = 0, y = 0, z = 0;
+    float sigmaZ = 5;
+    float beamWidthX = 5e-4, beamWidthY = 5e-4;
+    float dxdz = 0, dydz = 0;
+
+    BeamSpot() = default;
+    BeamSpot(float ix, float iy, float iz, float is, float ibx, float iby, float idxdz, float idydz)
+        : x(ix), y(iy), z(iz), sigmaZ(is), beamWidthX(ibx), beamWidthY(iby), dxdz(idxdz), dydz(idydz) {}
+  };
+}
+
+#endif

RecoTracker/MkFitCore/interface/Config.h

@@ -11,6 +11,7 @@ namespace mkfit {
     constexpr float PI3Over4 = 3.0f * Const::PI / 4.0f;
     constexpr float InvPI = 1.0f / Const::PI;
     constexpr float sol = 0.299792458;  // speed of light in m/ns
+    constexpr float sol_over_100 = 0.299792458e-2;
 
     // NAN and silly track parameter tracking options
     constexpr bool nan_etc_sigs_enable = false;
@@ -48,7 +49,7 @@ namespace mkfit {
     // Config for propagation - could/should enter into PropagationFlags?!
     constexpr int Niter = 5;
     constexpr bool useTrigApprox = true;
-    constexpr bool usePropToPlane = false;
+    constexpr bool usePropToPlane = true;
     constexpr bool usePtMultScat = false;
 
     // Config for Bfield. Note: for now the same for CMS-phase1 and CylCowWLids.

RecoTracker/MkFitCore/interface/DeadRegion.h

@@ -0,0 +1,14 @@
+#ifndef RecoTracker_MkFitCore_interface_DeadRegion_h
+#define RecoTracker_MkFitCore_interface_DeadRegion_h
+
+#include <vector>
+
+namespace mkfit {
+  struct DeadRegion {
+    float phi1, phi2, q1, q2;
+    DeadRegion(float a1, float a2, float b1, float b2) : phi1(a1), phi2(a2), q1(b1), q2(b2) {}
+  };
+  typedef std::vector<DeadRegion> DeadVec;
+}
+
+#endif

RecoTracker/MkFitCore/interface/Hit.h

@@ -273,21 +273,5 @@ namespace mkfit {
 
   void print(std::string_view label, const MeasurementState& s);
 
-  struct DeadRegion {
-    float phi1, phi2, q1, q2;
-    DeadRegion(float a1, float a2, float b1, float b2) : phi1(a1), phi2(a2), q1(b1), q2(b2) {}
-  };
-  typedef std::vector<DeadRegion> DeadVec;
-
-  struct BeamSpot {
-    float x = 0, y = 0, z = 0;
-    float sigmaZ = 5;
-    float beamWidthX = 5e-4, beamWidthY = 5e-4;
-    float dxdz = 0, dydz = 0;
-
-    BeamSpot() = default;
-    BeamSpot(float ix, float iy, float iz, float is, float ibx, float iby, float idxdz, float idydz)
-        : x(ix), y(iy), z(iz), sigmaZ(is), beamWidthX(ibx), beamWidthY(iby), dxdz(idxdz), dydz(idydz) {}
-  };
 }  // end namespace mkfit
 #endif

RecoTracker/MkFitCore/interface/HitStructures.h

@@ -3,6 +3,8 @@
 
 #include "RecoTracker/MkFitCore/interface/Config.h"
 #include "RecoTracker/MkFitCore/interface/Hit.h"
+#include "RecoTracker/MkFitCore/interface/BeamSpot.h"
+#include "RecoTracker/MkFitCore/interface/DeadRegion.h"
 #include "RecoTracker/MkFitCore/interface/TrackerInfo.h"
 #include "RecoTracker/MkFitCore/interface/binnor.h"