Changeset 95b4e9f in git for modules/VertexFinderDA4D.h

Timestamp:

Aug 31, 2016, 4:25:59 PM (8 years ago)

Author:

Pavel Demin <pavel.demin@…>

Branches:

ImprovedOutputFile, Timing, dual_readout, llp, master

Children:

4154bbd

Parents:

b195ba1

Message:

reorganize includes in vertexing modules

File:

• modules/VertexFinderDA4D.h (modified) (3 diffs)

modules/VertexFinderDA4D.h

@@ -11 +11 @@
 
 
+#include "classes/DelphesModule.h"
 
-#include "classes/DelphesModule.h"
-#include "classes/DelphesClasses.h"
-#include <utility>
-#include <algorithm>
-#include <stdexcept>
-#include <iostream>
 #include <vector>
-#include <unordered_map>
-
-using namespace std;
 
 class TObjArray;
+class TIterator;
 class Candidate;
-class TVector3;
 
 class VertexFinderDA4D: public DelphesModule
@@ -38 +30 @@
   void Finish();
 
-  struct track_t{
-  double z;              // z-coordinate at point of closest approach to the beamline
-  double t;              // t-coordinate at point of closest approach to the beamline
-  double dz2;            // square of the error of z(pca)
-  double dtz;            // covariance of z-t
-  double dt2;            // square of the error of t(pca)
-  //const reco::TransientTrack* tt;  // a pointer to the Transient Track
-  Candidate* tt;  // a pointer to the Candidate Track
-  double Z;              // Z[i]   for DA clustering
-  double pi;             // track weight
-  double pt;
-  double eta;
-  double phi;
-
-};
+  struct track_t
+  {
+    double z;      // z-coordinate at point of closest approach to the beamline
+    double t;      // t-coordinate at point of closest approach to the beamline
+    double dz2;    // square of the error of z(pca)
+    double dtz;    // covariance of z-t
+    double dt2;    // square of the error of t(pca)
+    Candidate* tt; // a pointer to the Candidate Track
+    double Z;      // Z[i]   for DA clustering
+    double pi;     // track weight
+    double pt;
+    double eta;
+    double phi;
+  };
 
 
-struct vertex_t{
-  double z;    //           z coordinate
-  double t;    //           t coordinate
-  double pk;   //           vertex weight for "constrained" clustering
-  // --- temporary numbers, used during update
-  double ei;
-  double sw;
-  double swz;
-  double swt;
-  double se;
-  // ---for Tc
-  double swE;
-  double Tc;
-};
-
-
+  struct vertex_t
+  {
+    double z;
+    double t;
+    double pk;     // vertex weight for "constrained" clustering
+    // --- temporary numbers, used during update
+    double ei;
+    double sw;
+    double swz;
+    double swt;
+    double se;
+    // ---for Tc
+    double swE;
+    double Tc;
+  };
 
   void clusterize(const TObjArray & tracks, TObjArray & clusters);
@@ -78 +68 @@
   std::vector<track_t> fill() const;
 
-  bool split( double beta,
+  bool split(double beta,
              std::vector<track_t> & tks,
              std::vector<vertex_t> & y) const;
 
-  double update( double beta,
+  double update(double beta,
                 std::vector<track_t> & tks,
-                std::vector<vertex_t> & y ) const;
+                std::vector<vertex_t> & y) const;
 
   double update(double beta,
-               std::vector<track_t> & tks,
-               std::vector<vertex_t> & y,
-               double & )const;
+                std::vector<track_t> & tks,
+                std::vector<vertex_t> & y,
+                double &)const;
 
   void dump(const double beta, const std::vector<vertex_t> & y, const std::vector<track_t> & tks) const;
   bool merge(std::vector<vertex_t> &) const;
-  bool merge(std::vector<vertex_t> &,double & ) const;
-  bool purge(std::vector<vertex_t> &, std::vector<track_t> & , double &, const double ) const;
+  bool merge(std::vector<vertex_t> &, double &) const;
+  bool purge(std::vector<vertex_t> &, std::vector<track_t> & , double &, const double) const;
 
-  void splitAll( std::vector<vertex_t> & y ) const;
+  void splitAll(std::vector<vertex_t> &y) const;
 
   double beta0(const double betamax,
-               std::vector<track_t> & tks,
-               std::vector<vertex_t> & y )const;
+               std::vector<track_t> &tks,
+               std::vector<vertex_t> &y)const;
 
-  double Eik(const track_t & t, const vertex_t & k)const;
-
+  double Eik(const track_t &t, const vertex_t &k)const;
 
 private: