Changeset 4154bbd in git for modules/VertexFinderDA4D.h

Timestamp:

Sep 1, 2016, 12:56:40 PM (8 years ago)

Author:

Pavel Demin <pavel.demin@…>

Branches:

ImprovedOutputFile, Timing, dual_readout, llp, master

Children:

61569e0

Parents:

95b4e9f

Message:

adapt vertexing modules to ROOT 5.34 and GCC 4.4

File:

• modules/VertexFinderDA4D.h (modified) (1 diff)

modules/VertexFinderDA4D.h

@@ -30 +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)
-    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;
-    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);
-
+  void clusterize(const TObjArray &tracks, TObjArray &clusters);
   std::vector< Candidate* > vertices();
-
-  std::vector<track_t> fill() const;
-
-  bool split(double beta,
-             std::vector<track_t> & tks,
-             std::vector<vertex_t> & y) const;
-
-  double update(double beta,
-                std::vector<track_t> & tks,
-                std::vector<vertex_t> & y) const;
-
-  double update(double beta,
-                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;
-
-  void splitAll(std::vector<vertex_t> &y) const;
-
-  double beta0(const double betamax,
-               std::vector<track_t> &tks,
-               std::vector<vertex_t> &y)const;
-
-  double Eik(const track_t &t, const vertex_t &k)const;
 
 private: