Modifications needed by TRD (Christoph)

diff --git a/STEER/AliAlignmentTracks.cxx b/STEER/AliAlignmentTracks.cxx
index efc068e5674dfff7eddf21f5282daa84a5a947f9..1836a314b719d66587634fe90f1d17c06eaf1e6a 100644 (file)
--- a/STEER/AliAlignmentTracks.cxx
+++ b/STEER/AliAlignmentTracks.cxx
@@ -351,7 +351,7 @@ void AliAlignmentTracks::InitAlignObjs()
     fAlignObjs[iLayer] = new AliAlignObj*[AliAlignObj::LayerSize(iLayer + AliAlignObj::kFirstLayer)];
     for (Int_t iModule = 0; iModule < AliAlignObj::LayerSize(iLayer + AliAlignObj::kFirstLayer); iModule++) {
       UShort_t volid = AliAlignObj::LayerToVolUID(iLayer+ AliAlignObj::kFirstLayer,iModule);
-      fAlignObjs[iLayer][iModule] = new AliAlignObjAngles("",volid,0,0,0,0,0,0,kTRUE);
+      fAlignObjs[iLayer][iModule] = new AliAlignObjAngles(AliAlignObj::SymName(volid),volid,0,0,0,0,0,0,kTRUE);
     }
   }
 }

diff --git a/STEER/AliMathBase.cxx b/STEER/AliMathBase.cxx
index 7d02171e8d2816fff2973fc8a35be7b9efe5d230..36ee5b2b124fa48b020b7ed81d3afda1f31865ee 100644 (file)
--- a/STEER/AliMathBase.cxx
+++ b/STEER/AliMathBase.cxx
@@ -59,7 +59,7 @@ void AliMathBase::EvaluateUni(Int_t nvectors, Double_t *data, Double_t &mean
   TMath::Sort(nvectors, data, index, kFALSE);
   
   Int_t    nquant = TMath::Min(Int_t(Double_t(((hh*1./nvectors)-0.5)*40))+1, 11);
-  Double_t factor = faclts[nquant-1];
+  Double_t factor = faclts[TMath::Max(0,nquant-1)];
   
   Double_t sumx  =0;
   Double_t sumx2 =0;

diff --git a/STEER/AliTrackFitterRieman.cxx b/STEER/AliTrackFitterRieman.cxx
index f737d772375d101a65e2c550532c4c90a32d6794..885c03753f54a52acc0cfc51a7ab21ab3b9b2775 100644 (file)
--- a/STEER/AliTrackFitterRieman.cxx
+++ b/STEER/AliTrackFitterRieman.cxx
@@ -155,7 +155,9 @@ Bool_t AliTrackFitterRieman::Fit(const TArrayI *volIds,const TArrayI *volIdsFit,
   // found using the covariance matrix of the point
   // (assuming sigma(x)=0 at the reference coordinate system.
   Int_t debugLevel = AliLog::GetDebugLevel("","AliTrackFitterRieman");
-  Float_t debugRatio = 1./(1.+debugLevel);
+  
+  //  Float_t debugRatio = 1./(1.+debugLevel);
+  Float_t debugRatio = debugLevel? 1.0/debugLevel : 1.0;
 
   const Int_t kMinPoints =1;
   Int_t npoints = fPoints->GetNPoints();
@@ -490,9 +492,17 @@ Bool_t AliTrackFitterRieman::GetPCA(const AliTrackPoint &p, AliTrackPoint &p2) c
   if (AliLog::GetDebugLevel("","AliTrackFitterRieman")>0 && gRandom->Rndm()<debugRatio){
     AliTrackPoint lp0(p);
     AliTrackPoint lp2(p2);
+    AliTrackPoint localp0(p);
+    AliTrackPoint localp2(p2);
+    Float_t lAngle = lp0.GetAngle();
+    localp0 = localp0.Rotate(lAngle);
+    localp2 = localp2.Rotate(lAngle);
+
     (*fDebugStream)<<"PCA"<<
-      "P0.="<<&lp0<<
+      "P0.="<<&lp0<<  //global position
       "P2.="<<&lp2<<
+      "LP0.="<<&localp0<<  //local position
+      "LP2.="<<&localp2<<
       "\n";
   }
   return kTRUE;
@@ -547,4 +557,3 @@ Double_t AliTrackFitterRieman::GetErrZ2at(Double_t x) const {
   }
   return TMath::Sqrt(error+correction);
 }
-