X-Git-Url: http://git.uio.no/git/?a=blobdiff_plain;f=STEER%2FAliTrackFitterStraight.cxx;h=cc04b8236c6a22e97c65092cf0b0c96b002dd79c;hb=b96c3aef7f7f315c41ce5174d704a2beca7b294d;hp=7d3226b68f6094d14a1ef2a40663434e4ed4b3d4;hpb=75e3794b7dc1d57df57450c120a9f8b50eef6121;p=u%2Fmrichter%2FAliRoot.git

diff --git a/STEER/AliTrackFitterStraight.cxx b/STEER/AliTrackFitterStraight.cxx
index 7d3226b68f6..cc04b8236c6 100644
--- a/STEER/AliTrackFitterStraight.cxx
+++ b/STEER/AliTrackFitterStraight.cxx
@@ -1,5 +1,24 @@
-#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)
@@ -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 {