Changes for the ExB and tpc coordinate transformation (Marian, Magnus)

[u/mrichter/AliRoot.git] / TPC / AliTPC.h

diff --git a/TPC/AliTPC.h b/TPC/AliTPC.h
index a1a88b9d73ade3ddda2a5a8cfbb7f442081b3384..3f07e51046b29aa3b648e764f9a71a38bd8077f4 100644 (file)
--- a/TPC/AliTPC.h
+++ b/TPC/AliTPC.h
@@ -11,6 +11,7 @@
 
 class TFile;
 class TTree;
+#include <Htypes.h>
 #include <TMatrixFfwd.h>
 #include <TVector.h>
 
@@ -19,6 +20,7 @@ class AliTPCLoader;
 class AliTPCParam;
 class AliTPCTrackHits; // M.I.  -MI4 old hits - to be removed later
 class AliTPCTrackHitsV2; // M.I.
+class AliRawReader;
 #include "AliDetector.h"
 #include "AliDigit.h" 
 #include "AliHit.h" 
@@ -29,7 +31,6 @@ class AliTPC : public AliDetector {
 public:
   AliTPC(); 
   AliTPC(const char *name, const char *title);
-  AliTPC(const AliTPC& t);
   
   virtual AliLoader* MakeLoader(const char* topfoldername);
   
@@ -38,6 +39,7 @@ public:
   virtual void  BuildGeometry();
   virtual void  CreateGeometry() {}
   virtual void  CreateMaterials();
+  virtual void  AddAlignableVolumes() const {}
   
   virtual AliDigitizer* CreateDigitizer(AliRunDigitizer* manager) const;
   virtual void  SDigits2Digits(){;} //MI change -cycling to production
@@ -52,6 +54,7 @@ public:
   virtual void  Init();
   virtual Int_t IsVersion() const =0;
   virtual void  Digits2Raw();
+  virtual Bool_t Raw2SDigits(AliRawReader* rawReader);
   Int_t         GetNsectors() const  {return fNsectors;}
   virtual void  MakeBranch(Option_t *opt=" ");
   virtual void  ResetDigits();
@@ -100,10 +103,10 @@ protected:
   Int_t          fSens;             // ISENS
   Int_t          fNsectors;         // Number of sectors in TPC
   //MI changes
-  AliTPCDigitsArray * fDigitsArray;              //!detector digit object  
+  AliTPCDigitsArray * fDigitsArray;              //! detector digit object  
   AliTPCParam *fTPCParam;           // pointer to TPC parameters 
-  AliTPCTrackHitsV2 *fTrackHits;      //!hits for given track M.I.
-  //  AliTPCTrackHits *fTrackHitsOld;      //!hits for given track M.I. MIold -
+  AliTPCTrackHitsV2 *fTrackHits;      //! hits for given track M.I.
+  //  AliTPCTrackHits *fTrackHitsOld;      //! hits for given track M.I. MIold -
 
   Int_t  fHitType; // if fNewHit = 1 old data structure if 2 new hits  if 4  old MI stucture
   //  3 both types 
@@ -114,6 +117,8 @@ protected:
   Float_t        fSide;  // selects left(-1), right(+1), or both(0) sides of the TPC
    
  private:
+  AliTPC(const AliTPC& t);
+  AliTPC &operator = (const AliTPC & param);
   //
   void SetDefaults();
   void DigitizeRow(Int_t irow,Int_t isec,TObjArray **rowTriplet);
@@ -127,10 +132,10 @@ protected:
                          // index[1] sector number, 
                          // index[2] pad row number  
                          // index[3] pad row number for which signal is calculated
-  Int_t      fNoiseDepth;  //!noise table
-  Float_t *  fNoiseTable;  //![fNoiseDepth] table with noise
-  Int_t      fCurrentNoise; //!index of the noise in  the noise table 
-  Bool_t*    fActiveSectors; //!bool indicating which sectors are active
+  Int_t      fNoiseDepth;  //! noise table
+  Float_t *  fNoiseTable;  //! table with noise
+  Int_t      fCurrentNoise; //! index of the noise in  the noise table 
+  Bool_t*    fActiveSectors; //! bool indicating which sectors are active
 
   ClassDef(AliTPC,12)  // Time Projection Chamber class
 };
@@ -146,7 +151,7 @@ public:
    Float_t   fTime;       //hit time
  
 public:
-   AliTPChit() {fTime = 0.;}
+   AliTPChit();
    AliTPChit(Int_t shunt, Int_t track, Int_t *vol, Float_t *hits);
    virtual ~AliTPChit() {}
    void SetX(Float_t x){fX = x;}