X-Git-Url: http://git.uio.no/git/?a=blobdiff_plain;f=STEER%2FAliTrackFitterStraight.cxx;h=cc04b8236c6a22e97c65092cf0b0c96b002dd79c;hb=94faf3bebf4ca1bc788562c477a940e24672d375;hp=36f207e82976b6bbe88e132c39b71f6b6a366529;hpb=3bbfb2915bde0f146a6127ee8fc79dce670b6585;p=u%2Fmrichter%2FAliRoot.git

diff --git a/STEER/AliTrackFitterStraight.cxx b/STEER/AliTrackFitterStraight.cxx
index 36f207e8297..cc04b8236c6 100644
--- a/STEER/AliTrackFitterStraight.cxx
+++ b/STEER/AliTrackFitterStraight.cxx
@@ -1,53 +1,72 @@
-#include "TMatrixDSym.h"
-#include "TMatrixD.h"
+/**************************************************************************
+ * Copyright(c) 1998-1999, ALICE Experiment at CERN, All rights reserved. *
+ *                                                                        *
+ * Author: The ALICE Off-line Project.                                    *
+ * Contributors are mentioned in the code where appropriate.              *
+ *                                                                        *
+ * Permission to use, copy, modify and distribute this software and its   *
+ * documentation strictly for non-commercial purposes is hereby granted   *
+ * without fee, provided that the above copyright notice appears in all   *
+ * copies and that both the copyright notice and this permission notice   *
+ * appear in the supporting documentation. The authors make no claims     *
+ * about the suitability of this software for any purpose. It is          *
+ * provided "as is" without express or implied warranty.                  *
+ **************************************************************************/
+
+/* $Id$ */
+
+#include <TMath.h>
+#include <TMatrixDSym.h>
+#include <TMatrixD.h>
+
 #include "AliTrackFitterStraight.h"
 
 ClassImp(AliTrackFitterStraight)
 
 AliTrackFitterStraight::AliTrackFitterStraight():
-  AliTrackFitter()
+  AliTrackFitter(),
+  fAlpha(0.),
+  fSumYY(0),
+  fSumZZ(0),
+  fNUsed(0),
+  fConv(kFALSE)
 {
   //
   // default constructor
   //
-  fAlpha = 0.;
   for (Int_t i=0;i<5;i++) fSumXY[i] = 0;
-  fSumYY = 0;
   for (Int_t i=0;i<5;i++) fSumXZ[i] = 0;
-  fSumZZ = 0;
-  fNUsed = 0;
-  fConv = kFALSE;
 }
 
 
 AliTrackFitterStraight::AliTrackFitterStraight(AliTrackPointArray *array, Bool_t owner):
-  AliTrackFitter(array,owner)
+  AliTrackFitter(array,owner),
+  fAlpha(0.),
+  fSumYY(0),
+  fSumZZ(0),
+  fNUsed(0),
+  fConv(kFALSE)
 {
   //
   // Constructor
   //
-  fAlpha = 0.;
   for (Int_t i=0;i<5;i++) fSumXY[i] = 0;
-  fSumYY = 0;
   for (Int_t i=0;i<5;i++) fSumXZ[i] = 0;
-  fSumZZ = 0;
-  fNUsed = 0;
-  fConv = kFALSE;
 }
 
 AliTrackFitterStraight::AliTrackFitterStraight(const AliTrackFitterStraight &fitter):
-  AliTrackFitter(fitter)
+  AliTrackFitter(fitter),
+  fAlpha(fitter.fAlpha),
+  fSumYY(fitter.fSumYY),
+  fSumZZ(fitter.fSumZZ),
+  fNUsed(fitter.fNUsed),
+  fConv(fitter.fConv)
 {
   //
   // copy constructor
   //
-  fAlpha = fitter.fAlpha;
   for (Int_t i=0;i<5;i++) fSumXY[i]  = fitter.fSumXY[i];
-  fSumYY = fitter.fSumYY;
   for (Int_t i=0;i<5;i++) fSumXZ[i]  = fitter.fSumXZ[i];
-  fSumZZ = fitter.fSumZZ;
-  fNUsed = fitter.fNUsed;
-  fConv = fitter.fConv;
 }
 
 //_____________________________________________________________________________
@@ -90,8 +109,8 @@ void AliTrackFitterStraight::Reset()
 }
 
 Bool_t AliTrackFitterStraight::Fit(const TArrayI *volIds,const TArrayI *volIdsFit,
-				 AliAlignObj::ELayerID layerRangeMin,
-				 AliAlignObj::ELayerID layerRangeMax)
+				 AliGeomManager::ELayerID layerRangeMin,
+				 AliGeomManager::ELayerID layerRangeMax)
 {
   // Fit the track points. The method takes as an input
   // the set of id's (volids) of the volumes in which
@@ -133,9 +152,9 @@ Bool_t AliTrackFitterStraight::Fit(const TArrayI *volIds,const TArrayI *volIdsFi
 	if (!FindVolId(volIdsFit,iVolId)) continue;
       }
       else {
-	if (iVolId < AliAlignObj::LayerToVolUID(layerRangeMin,0) ||
-	    iVolId > AliAlignObj::LayerToVolUID(layerRangeMax,
-						AliAlignObj::LayerSize(layerRangeMax))) continue;
+	if (iVolId < AliGeomManager::LayerToVolUID(layerRangeMin,0) ||
+	    iVolId > AliGeomManager::LayerToVolUID(layerRangeMax,
+						AliGeomManager::LayerSize(layerRangeMax))) continue;
       }
       if (!isAlphaCalc) {
 	fAlpha = p.GetAngle();
@@ -209,7 +228,7 @@ void AliTrackFitterStraight::AddPoint(Float_t x, Float_t y, Float_t z, Float_t s
   fSumZZ += z*z*weight;
 }
 
-void AliTrackFitterStraight::Update(){
+Bool_t AliTrackFitterStraight::Update(){
   //
   //  Track fitter update
   //
@@ -268,6 +287,8 @@ void AliTrackFitterStraight::Update(){
     fConv =kTRUE;
   else
     fConv=kFALSE;
+
+  return kTRUE;
 }
 
 Double_t AliTrackFitterStraight::GetYat(Double_t x) const {