Global re-calibration added, Nonlinearity _on_ by default

[u/mrichter/AliRoot.git] / TRD / AliTRDtrackletWord.h

diff --git a/TRD/AliTRDtrackletWord.h b/TRD/AliTRDtrackletWord.h
index 030e050131418151b7d65fd4cd85ab1b3ffde245..ca0409329e8472770e9b4ef6001a0d687738d739 100644 (file)
--- a/TRD/AliTRDtrackletWord.h
+++ b/TRD/AliTRDtrackletWord.h
@@ -24,20 +24,25 @@ class AliTRDtrackletWord : public AliTRDtrackletBase {
   ~AliTRDtrackletWord();
 
   // ----- Getters for contents of tracklet word -----
-  Int_t GetYbin() const; 
-  Int_t GetdY() const; 
+  Int_t GetYbin() const;
+  Int_t GetdY() const;
   Int_t GetZbin() const { return ((fTrackletWord >> 20) & 0xf); }
   Int_t GetPID() const { return ((fTrackletWord >> 24) & 0xff); }
 
+  Int_t GetROB() const;
+  Int_t GetMCM() const;
+
   // ----- Getters for offline corresponding values -----
   Bool_t CookPID() { return kFALSE; }
-  Double_t GetPID(Int_t /* is */) const { return 0; }
+  Double_t GetPID(Int_t /* is */) const { return (Double_t) GetPID()/256.; }
   Int_t GetDetector() const { return fHCId / 2; }
   Int_t GetHCId() const { return fHCId; }
   Float_t GetdYdX() const { return (GetdY() * 140e-4 / 3.); }
   Float_t GetX() const { return fgGeo->GetTime0((fHCId%12)/2); }
   Float_t GetY() const { return (GetYbin() * 160e-4); }
-  Float_t GetZ() const { return fgGeo->GetPadPlane((fHCId % 12) / 2, (fHCId/12) % 5)->GetRowPos(GetZbin()); }
+  Float_t GetZ() const { return fgGeo->GetPadPlane((fHCId % 12) / 2, (fHCId/12) % 5)->GetRowPos(GetZbin()) -
+      fgGeo->GetPadPlane((fHCId % 12) / 2, (fHCId/12) % 5)->GetRowSize(GetZbin()); }
+  Float_t GetLocalZ() const { return GetZ() - fgGeo->GetPadPlane((fHCId % 12) / 2, (fHCId/12) % 5)->GetRowPos(8); }
 
   UInt_t GetTrackletWord() const { return fTrackletWord; }
   void SetTrackletWord(UInt_t trackletWord) { fTrackletWord = trackletWord; }
@@ -46,15 +51,15 @@ class AliTRDtrackletWord : public AliTRDtrackletBase {
   void SetHCId(Int_t id) { fHCId = id; }
 
  protected:
-  Int_t fHCId;                  //! half-chamber ID (only transient)
-  UInt_t fTrackletWord;                // tracklet word: PID | Z | deflection length | Y 
-                               //          bits:  12   4            7          13
+  Int_t fHCId;                  // half-chamber ID
+  UInt_t fTrackletWord;                // tracklet word: PID | Z | deflection length | Y
+                               //          bits:   8   4            7          13
   static AliTRDgeometry *fgGeo;  // pointer to TRD geometry for coordinate calculations
 
  private:
   AliTRDtrackletWord& operator=(const AliTRDtrackletWord &rhs);   // not implemented
 
-  ClassDef(AliTRDtrackletWord, 1);
+  ClassDef(AliTRDtrackletWord, 2);
 };
 
 #endif