Merge changes from branches/dev/EVE. This branch was following development in ROOT...

[u/mrichter/AliRoot.git] / EVE / EveBase / AliEveTrackFitter.h

diff --git a/EVE/EveBase/AliEveTrackFitter.h b/EVE/EveBase/AliEveTrackFitter.h
index 1a52b927c7cbf484bf043027f257fa28336908b2..c9731b5dabe698ac59aeffb6689de40c349fcc3d 100644 (file)
--- a/EVE/EveBase/AliEveTrackFitter.h
+++ b/EVE/EveBase/AliEveTrackFitter.h
@@ -7,8 +7,8 @@
  * full copyright notice.                                                 *
  **************************************************************************/
 
-#ifndef ALIEVE_TrackFitter_H
-#define ALIEVE_TrackFitter_H
+#ifndef AliEveTrackFitter_H
+#define AliEveTrackFitter_H
 
 #include <TEvePointSet.h>
 #include <map>
@@ -35,49 +35,51 @@ protected:
     Point_t(TEvePointSet* ps=0, Int_t i=0) : fPS(ps), fIdx(i) {}
     Point_t(const Point_t& p) : fPS(p.fPS), fIdx(p.fIdx)  {}
 
-    Point_t& operator=(const Point_t& p) {
+    Point_t& operator=(const Point_t& p)
+    {
       fPS = p.fPS; fIdx = p.fIdx; return *this;
     }
 
-    bool operator<(const Point_t& o) const {
+    bool operator<(const Point_t& o) const
+    {
       if (fPS != o.fPS) return fPS < o.fPS;
       return fIdx < o.fIdx;
     }
   };
 
-  typedef std::map<Point_t, Int_t>          PointMap_t;
+  typedef std::map<Point_t, Int_t> PointMap_t;
 
-  Float_t            fAlpha;                // transformation angle to AliRieman local system (where x>>y)
-  AliRieman*         fRieman;               // rieman fitter
+  Float_t            fAlpha;           // transformation angle to AliRieman local system (where x>>y)
+  AliRieman*         fRieman;          // rieman fitter
 
-  Bool_t             fConnected;            // connection to the TEvePointSet signal
+  Bool_t             fConnected;       // connection to the TEvePointSet signal
 
-  PointMap_t         fSPMap;                // map of selected points
-  TEveTrackList*     fTrackList;            // list of tracks removed in the destructor
+  PointMap_t         fSPMap;           // map of selected points
+  TEveTrackList*     fTrackList;       // list of tracks removed in the destructor
 
-  TGraph            *fGraphPicked;          // graph of selected points debug info
-  TGraphErrors      *fGraphHelix;           // graph of fitted points for debug info
+  TGraph            *fGraphPicked;     // graph of selected points debug info
+  TGraphErrors      *fGraphHelix;      // graph of fitted points for debug info
 
 public:
-  AliEveTrackFitter(const Text_t* name = "TrackFitter", Int_t n_points=0);
+  AliEveTrackFitter(const Text_t* name = "TrackFitter", Int_t nPoints=0);
   virtual ~AliEveTrackFitter();
 
-  virtual void  AddFitPoint(TEvePointSet*,Int_t);  // slot for PointCtrlClicked() signal
+  virtual void DestroyElements();
+
+  virtual void  AddFitPoint(Int_t pointId);  // slot for TEvePointSet::PointSelected() signal
 
   virtual void  Start();
   virtual void  Stop();
   virtual void  FitTrack();
-  virtual void  Reset(Int_t n_points=0, Int_t n_int_ids=0);
+  virtual void  Reset(Int_t nPoints=0, Int_t nIntIds=0);
 
-  Bool_t        GetConnected(){ return fConnected; }
-  AliRieman*    GetRieman(){ return fRieman; }
+  Bool_t        GetConnected() const { return fConnected; }
+  AliRieman*    GetRieman()    const { return fRieman; }
 
-  TGraph*       GetGraphPicked()   { return fGraphPicked; }
-  TGraphErrors* GetGraphHelix()    { return fGraphHelix; }
+  TGraph*       GetGraphPicked() const { return fGraphPicked; }
+  TGraphErrors* GetGraphHelix()  const { return fGraphHelix; }
   void          DrawDebugGraph();
 
-  virtual void  DestroyElements();   // *MENU*
-
   ClassDef(AliEveTrackFitter, 0); // Interface of TEvePointSet allowing helix fit.
 };