quinnanm 1

Author: tschuh

DataFormats/L1TrackTrigger/src/TTDTC.cc

@@ -3,10 +3,6 @@
 
 #include <numeric>
 
-using namespace std;
-using namespace edm;
-using namespace tt;
-
 TTDTC::TTDTC(int numRegions, int numOverlappingRegions, int numDTCsPerRegion)
     : numRegions_(numRegions),
       numOverlappingRegions_(numOverlappingRegions),
@@ -15,13 +11,13 @@ TTDTC::TTDTC(int numRegions, int numOverlappingRegions, int numDTCsPerRegion)
       regions_(numRegions_),
       channels_(numDTCsPerTFP_),
       streams_(numRegions_ * numDTCsPerTFP_) {
-  iota(regions_.begin(), regions_.end(), 0);
-  iota(channels_.begin(), channels_.end(), 0);
+  std::iota(regions_.begin(), regions_.end(), 0);
+  std::iota(channels_.begin(), channels_.end(), 0);
 }
 
 // write one specific stream of TTStubRefs using DTC identifier (region[0-8], board[0-23], channel[0-1])
 // dtcRegions aka detector regions are defined by tk layout
-void TTDTC::setStream(int dtcRegion, int dtcBoard, int dtcChannel, const StreamStub& stream) {
+void TTDTC::setStream(int dtcRegion, int dtcBoard, int dtcChannel, const tt::StreamStub& stream) {
   // check arguments
   const bool oorRegion = dtcRegion >= numRegions_ || dtcRegion < 0;
   const bool oorBoard = dtcBoard >= numDTCsPerRegion_ || dtcBoard < 0;
@@ -45,7 +41,7 @@ void TTDTC::setStream(int dtcRegion, int dtcBoard, int dtcChannel, const StreamS
 
 // read one specific stream of TTStubRefs using TFP identifier (region[0-8], channel[0-47])
 // tfpRegions aka processing regions are rotated by -0.5 region width w.r.t detector regions
-const StreamStub& TTDTC::stream(int tfpRegion, int tfpChannel) const {
+const tt::StreamStub& TTDTC::stream(int tfpRegion, int tfpChannel) const {
   // check arguments
   const bool oorRegion = tfpRegion >= numRegions_ || tfpRegion < 0;
   const bool oorChannel = tfpChannel >= numDTCsPerTFP_ || tfpChannel < 0;
@@ -65,25 +61,25 @@ const StreamStub& TTDTC::stream(int tfpRegion, int tfpChannel) const {
 
 // total number of frames
 int TTDTC::size() const {
-  auto all = [](int sum, const StreamStub& stream) { return sum + stream.size(); };
-  return accumulate(streams_.begin(), streams_.end(), 0, all);
+  auto all = [](int sum, const tt::StreamStub& stream) { return sum + stream.size(); };
+  return std::accumulate(streams_.begin(), streams_.end(), 0, all);
 }
 
 // total number of stubs
 int TTDTC::nStubs() const {
-  auto stubs = [](int sum, const FrameStub& frame) { return sum + frame.first.isNonnull(); };
+  auto stubs = [](int sum, const tt::FrameStub& frame) { return sum + frame.first.isNonnull(); };
   int n(0);
-  for (const StreamStub& stream : streams_)
-    n += accumulate(stream.begin(), stream.end(), 0, stubs);
+  for (const tt::StreamStub& stream : streams_)
+    n += std::accumulate(stream.begin(), stream.end(), 0, stubs);
   return n;
 }
 
 // total number of gaps
 int TTDTC::nGaps() const {
-  auto gaps = [](int sum, const FrameStub& frame) { return sum + frame.first.isNull(); };
+  auto gaps = [](int sum, const tt::FrameStub& frame) { return sum + frame.first.isNull(); };
   int n(0);
-  for (const StreamStub& stream : streams_)
-    n += accumulate(stream.begin(), stream.end(), 0, gaps);
+  for (const tt::StreamStub& stream : streams_)
+    n += std::accumulate(stream.begin(), stream.end(), 0, gaps);
   return n;
 }
 

L1Trigger/TrackFindingTracklet/interface/KalmanFilter.h

@@ -154,4 +154,4 @@ namespace trklet {
 
 }  // namespace trklet
 
-#endif
+#endif

L1Trigger/TrackFindingTracklet/interface/KalmanFilterFormats.h

@@ -19,6 +19,28 @@ enabling tuning of bit widths
 
 namespace trklet {
 
+  /*
+  *          All variable names & equations come from Fruhwirth KF paper
+  *          http://dx.doi.org/10.1016/0168-9002%2887%2990887-4
+  *          Summary of variables:
+  *          m = hit position (phi,z)
+  *          V = hit position 2x2 covariance matrix in (phi,z).
+  *          x = helix params
+  *          C = helix params 4x4 covariance matrix
+  *          r = residuals
+  *          H = 2x4 derivative matrix (expected stub position w.r.t. helix params)
+  *          K = KF gain 2x2 matrix
+  *          x' & C': Updated values of x & C after KF iteration
+  *          Boring: F = unit matrix; pxcov = C
+  *          Summary of equations:
+  *          S = H*C (2x4 matrix); St = Transpose S
+  *          R = V + H*C*Ht (KF paper) = V + H*St (used here at simpler): 2x2 matrix
+  *          Rinv = Inverse R
+  *          K = St * Rinv : 2x2 Kalman gain matrix * det(R)
+  *          r = m - H*x
+  *          x' = x + K*r
+  *          C' = C - K*H*C (KF paper) = C - K*S (used here as simpler)
+  */
   enum class VariableKF {
     begin,
     x0 = begin,
@@ -160,7 +182,7 @@ namespace trklet {
     const tt::Setup* setup() const { return dataFormats_->setup(); }
     const DataFormats* dataFormats() const { return dataFormats_; }
     void consume(const DataFormats* dataFormats, const ConfigKF& iConfig);
-    void endJob();
+    void endJob(std::stringstream& ss);
 
   private:
     template <VariableKF it = VariableKF::begin>

L1Trigger/TrackFindingTracklet/interface/State.h

@@ -140,4 +140,4 @@ namespace trklet {
 
 }  // namespace trklet
 
-#endif
+#endif

L1Trigger/TrackFindingTracklet/interface/TrackFindingProcessor.h

@@ -88,4 +88,4 @@ namespace trklet {
 
 }  // namespace trklet
 
-#endif
+#endif