X-Git-Url: http://git.uio.no/git/?a=blobdiff_plain;f=STEER%2FAliTrackFitterStraight.cxx;h=cc04b8236c6a22e97c65092cf0b0c96b002dd79c;hb=1d0892073dd5ba07a6f9658d1df0af9b73206a50;hp=0dc49ecc45b2b9bb72e4380625c9b3028c473e5f;hpb=3010c308f6e4ec63eca9ee50a890049038e342b7;p=u%2Fmrichter%2FAliRoot.git diff --git a/STEER/AliTrackFitterStraight.cxx b/STEER/AliTrackFitterStraight.cxx index 0dc49ecc45b..cc04b8236c6 100644 --- a/STEER/AliTrackFitterStraight.cxx +++ b/STEER/AliTrackFitterStraight.cxx @@ -109,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 @@ -152,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(); @@ -228,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 // @@ -287,6 +287,8 @@ void AliTrackFitterStraight::Update(){ fConv =kTRUE; else fConv=kFALSE; + + return kTRUE; } Double_t AliTrackFitterStraight::GetYat(Double_t x) const {