X-Git-Url: http://git.uio.no/git/?p=u%2Fmrichter%2FAliRoot.git;a=blobdiff_plain;f=TRD%2FAliTRDcluster.cxx;h=c0f5b71ea4de3693651ce30906e8a8e9367d4098;hp=2fb0945f22bd08f5b190c951aefa3180e45f13ec;hb=348ffd5c6df1929bd8b93cb202668a516bd8b31d;hpb=f2e15e5b2658d290a14cf7dd3176355aea2b5445

diff --git a/TRD/AliTRDcluster.cxx b/TRD/AliTRDcluster.cxx
index 2fb0945f22b..c0f5b71ea4d 100644
--- a/TRD/AliTRDcluster.cxx
+++ b/TRD/AliTRDcluster.cxx
@@ -86,8 +86,8 @@ AliTRDcluster::AliTRDcluster(Int_t det, UChar_t col, UChar_t row, UChar_t time
 
 //___________________________________________________________________________
 AliTRDcluster::AliTRDcluster(Int_t det, Float_t q
-                           , Float_t *pos, Float_t *sig
-                           , Int_t *tracks, Char_t npads, Short_t * const signals
+                           , const Float_t *pos, const Float_t *sig
+                           , const Int_t *tracks, Char_t npads, Short_t * const signals
                            , UChar_t col, UChar_t row, UChar_t time
                            , Char_t timebin, Float_t center, UShort_t volid)
   :AliCluster(volid,pos[0],pos[1],pos[2],sig[0],sig[1],0.0,0x0) 
@@ -131,6 +131,11 @@ AliTRDcluster::AliTRDcluster(const AliTRDtrackletWord *const tracklet, Int_t det
   //
   // Constructor from online tracklet 
   //
+
+  for (Int_t i = 0; i < 7; i++) {
+    fSignals[i] = 0;
+  }
+
 }
 
 //_____________________________________________________________________________
@@ -803,6 +808,8 @@ void AliTRDcluster::SetSigmaY2(Float_t s2, Float_t dt, Float_t exb, Float_t x, F
   }
 
   // store tg^2(phi-a_L) and tg^2(a_L)
+  // limit parametrization to a maximum angle of 25 deg
+  if(TMath::Abs(tgp)>0.466) tgp = (tgp>0.)?0.466:-0.466;
   Double_t tgg = (tgp-exb)/(1.+tgp*exb); tgg *= tgg;
   Double_t exb2= exb*exb;
 
@@ -855,21 +862,26 @@ void AliTRDcluster::Print(Option_t *o) const
   //
 
   if(strcmp(o, "a")==0) {
+    Char_t mcInfo[100]; if(IsMCcluster()) snprintf(mcInfo, 100, "\n         MC[%5d %5d %5d]", GetLabel(0), GetLabel(1), GetLabel(2));
     AliInfo(Form(
-    "\nDet[%3d] LTrC[%+6.2f %+6.2f %+6.2f] Q[%5.1f] FLAG[in(%c) use(%c) sh(%c)] Y[%s]"
+    "\nDet[%3d] LTrC[%+6.2f %+6.2f %+6.2f] Q[%6.2f] Qr[%4d] FLAG[in(%c) use(%c) sh(%c)] Y[%s]"
     "\n         LChC[c(%3d) r(%2d) t(%2d)] t-t0[%2d] Npad[%d] cen[%5.3f] mask[%d]"
-    "\n         QS[%3d %3d %3d %3d %3d %3d %3d] S2[%e %e]"
-    , fDetector, GetX(), GetY(), GetZ(), fQ, 
+    "\n         QS[%s][%3d %3d %3d %3d %3d %3d %3d]"
+    "\n         S2Y[%e] S2Z[%e]"
+    "%s"
+    , fDetector, GetX(), GetY(), GetZ(), fQ, GetRawQ(),  
     IsInChamber() ? 'y' : 'n', 
     IsUsed() ? 'y' : 'n', 
     IsShared() ? 'y' : 'n',
     IsRPhiMethod(kGAUS)?"GAUS":(IsRPhiMethod(kLUT)?"LUT":"COG")
     , fPadCol, fPadRow, fPadTime, fLocalTimeBin, fNPads, fCenter, fClusterMasking
-    , fSignals[0], fSignals[1], fSignals[2], fSignals[3]
+    , TestBit(kRawSignals)?"raw":"cal", fSignals[0], fSignals[1], fSignals[2], fSignals[3]
     , fSignals[4], fSignals[5], fSignals[6]
-    , GetSigmaY2(), GetSigmaZ2()));
+    , GetSigmaY2(), GetSigmaZ2()
+    , IsMCcluster()?mcInfo:""
+    ));
   } else { 
-    AliInfo(Form("Det[%3d] LTrC[%+6.2f %+6.2f %+6.2f] Q[%5.1f] FLAG[in(%c) use(%c) sh(%c)] Y[%s]", 
+    AliInfo(Form("Det[%3d] LTrC[%+6.2f %+6.2f %+6.2f] Q[%6.2f] FLAG[in(%c) use(%c) sh(%c)] Y[%s]",
     fDetector, GetX(), GetY(), GetZ(), fQ, 
     IsInChamber() ? 'y' : 'n', 
     IsUsed() ? 'y' : 'n',