Merge branch 'master' of https://git.cern.ch/reps/AliRoot

[u/mrichter/AliRoot.git] / TPC / AliTPCExBConical.h

diff --git a/TPC/AliTPCExBConical.h b/TPC/AliTPCExBConical.h
index 86660f15ca0870ebf491a2375ce4d3d5aa2ab7c4..241147e2acdf3aefa4bddba3ce2dd79bd36a4979 100644 (file)
--- a/TPC/AliTPCExBConical.h
+++ b/TPC/AliTPCExBConical.h
@@ -4,12 +4,11 @@
 /* Copyright(c) 1998-1999, ALICE Experiment at CERN, All rights reserved. *
  * See cxx source for full Copyright notice                               */
 
-////////////////////////////////////////////////////////////////////////////
-//                                                                        //
-// AliTPCExBConical class                                                   //
-// date: 02/05/2010                                                       //
-// Authors: Maarian Ivanov, Jim Thomas, Magnus Mager, Stefan Rossegger                    //
-////////////////////////////////////////////////////////////////////////////
+/// \class AliTPCExBConical
+/// \brief Calculates the space point distortions due to the conical shape of ALICE TPC
+///
+/// \author Maarian Ivanov, Jim Thomas, Magnus Mager, Stefan Rossegger
+/// \date 02/05/2010
 
 #include "AliTPCCorrection.h"
 
@@ -25,10 +24,9 @@ public:
 
   // common setters and getters for ExB
   virtual void SetOmegaTauT1T2(Float_t omegaTau,Float_t t1,Float_t t2) {
-    const Float_t wt1=t1*omegaTau;
-    fC1=wt1/(1.+wt1*wt1);
-    const Float_t wt2=t2*omegaTau;
-    fC2=wt2*wt2/(1.+wt2*wt2);
+    fT1=t1; fT2=t2;
+    const Float_t wt1=t1*omegaTau;    fC1=wt1/(1.+wt1*wt1);
+    const Float_t wt2=t2*omegaTau;    fC2=wt2*wt2/(1.+wt2*wt2);
   };
   void SetC1C2(Float_t c1,Float_t c2) {fC1=c1;fC2=c2;} // CAUTION: USE WITH CARE
   Float_t GetC1() const {return fC1;}
@@ -43,17 +41,17 @@ public:
   Float_t GetConicalC(Int_t i) const {return fConicalC[i];}
   Float_t GetConicalFactor() const {return fConicalFactor;}
 
-  virtual void Print(Option_t* option="") const;
+  virtual void Print(const Option_t* option="") const;
 
 protected:
   virtual void GetCorrection(const Float_t x[],const Short_t roc,Float_t dx[]);
 
 private:
-  Float_t fC1; // coefficient C1                 (compare Jim Thomas's notes for definitions)
-  Float_t fC2; // coefficient C2                 (compare Jim Thomas's notes for definitions)
-  Float_t  fConicalFactor;                  // empirical factor - transform conical angle to delta
-  Float_t  fConicalA[3];               // Conical shape parameterization A side
-  Float_t  fConicalC[3];               // Conical shape parameterization C side
+  Float_t fC1; ///< coefficient C1                 (compare Jim Thomas's notes for definitions)
+  Float_t fC2; ///< coefficient C2                 (compare Jim Thomas's notes for definitions)
+  Float_t  fConicalFactor;                  ///< empirical factor - transform conical angle to delta
+  Float_t  fConicalA[3];               ///< Conical shape parameterization A side
+  Float_t  fConicalC[3];               ///< Conical shape parameterization C side
 
   ClassDef(AliTPCExBConical,1);
 };