Correct account of tilting angle (M.Ivanov)

diff --git a/TRD/AliTRDclusterizerV1.cxx b/TRD/AliTRDclusterizerV1.cxx
index c41b25511014addb9127a2f474f5d61674cc75e4..c5fff1f5e931a23ddb8536e8a19077d93ee39ac7 100644 (file)
--- a/TRD/AliTRDclusterizerV1.cxx
+++ b/TRD/AliTRDclusterizerV1.cxx
@@ -251,8 +251,8 @@ Bool_t AliTRDclusterizerV1::MakeClusters()
 
         // Loop through the chamber and find the maxima 
         for ( row = 0;  row <  nRowMax;    row++) {
-         //          for ( col = 2;  col <  nColMax;    col++) {
-          for ( col = 4;  col <  nColMax-2;    col++) {
+         for ( col = 2;  col <  nColMax;    col++) {
+           //for ( col = 4;  col <  nColMax-2;    col++) {
             for (time = 0; time < nTimeTotal; time++) {
 
               Int_t signalL = TMath::Abs(digits->GetDataUnchecked(row,col  ,time));
@@ -271,7 +271,8 @@ Bool_t AliTRDclusterizerV1::MakeClusters()
 //           }
              // Look for the maximum
               if (signalM >= maxThresh) {
-                if ( (signalL<=signalM) && (signalR<=signalM) && (signalL+signalR)>sigThresh ) {
+                if ( (TMath::Abs(signalL)<=signalM) && (TMath::Abs(signalR)<=signalM) && 
+                    (TMath::Abs(signalL)+TMath::Abs(signalR))>sigThresh ) {
                   // Maximum found, mark the position by a negative signal
                   digits->SetDataUnchecked(row,col-1,time,-signalM);
                }
@@ -420,7 +421,7 @@ Bool_t AliTRDclusterizerV1::MakeClusters()
                  Double_t check = fPar->LUTposition(iplan,clusterSignal[0]
                                                           ,clusterSignal[1]
                                                          ,clusterSignal[2]);
-                 //              clusterPads[1] = check;
+                 //              Float_t diff = clusterPads[1] -  check;
 
                }
 
@@ -446,7 +447,7 @@ Bool_t AliTRDclusterizerV1::MakeClusters()
                          ,clusterCharge
                          ,clusterTracks
                          ,clusterSig
-                         ,iType);
+                          ,iType,clusterPads[1]);
 
               }
             } 

diff --git a/TRD/AliTRDdigitizer.cxx b/TRD/AliTRDdigitizer.cxx
index 715ae6ed2ca2a2bdce1fb2f3542d1475e5f3778c..3df714cbe3294151c9779be1d82eaa8b2916afc5 100644 (file)
--- a/TRD/AliTRDdigitizer.cxx
+++ b/TRD/AliTRDdigitizer.cxx
@@ -866,9 +866,10 @@ Bool_t AliTRDdigitizer::MakeDigits()
           Double_t rowOffset = padPlane->GetPadRowOffset(rowE,xyz[2]);
 
           // The pad column (rphi-direction)
-          Int_t    colE      = padPlane->GetPadColNumber(xyz[1],rowOffset);
-          if (colE < 0) continue;
-          Double_t colOffset = padPlane->GetPadColOffset(colE,xyz[1]);
+         Float_t offsetTilt     = padPlane->GetTiltOffset(rowOffset);   // MI change
+          Int_t    colE      = padPlane->GetPadColNumber(xyz[1]+offsetTilt,rowOffset);
+          if (colE < 0) continue;        
+          Double_t colOffset = padPlane->GetPadColOffset(colE,xyz[1]+offsetTilt);
 
          // Convert the position to drift time, using either constant drift velocity or
           // time structure of drift cells (non-isochronity, GARFIELD calculation).

diff --git a/TRD/AliTRDtracker.cxx b/TRD/AliTRDtracker.cxx
index 33e1175032f9c1672555f6a91e2723c6d8fd35e0..6e82a97621e1b0ba3c200ff9307582539112cb0d 100644 (file)
--- a/TRD/AliTRDtracker.cxx
+++ b/TRD/AliTRDtracker.cxx
@@ -2638,17 +2638,12 @@ Double_t AliTRDtracker::GetTiltFactor(const AliTRDcluster* c) {
 //
 //  Returns correction factor for tilted pads geometry 
 //
-  AliTRDpadPlane *padPlane = fPar->GetPadPlane(0,0);
-  Double_t h01 = sin(TMath::Pi() / 180.0 * padPlane->GetTiltingAngle());
-  //Double_t h01 = sin(TMath::Pi() / 180.0 * fPar->GetTiltingAngle());
   Int_t det = c->GetDetector();    
   Int_t plane = fGeom->GetPlane(det);
-
-  //if((plane == 1) || (plane == 3) || (plane == 5)) h01=-h01;
-  if((plane == 0) || (plane == 2) || (plane == 4)) h01=-h01;
+  AliTRDpadPlane *padPlane = fPar->GetPadPlane(plane,0);
+  Double_t h01 = TMath::Tan(-TMath::Pi() / 180.0 * padPlane->GetTiltingAngle());
 
   if(fNoTilt) h01 = 0;
-  
   return h01;
 }