X-Git-Url: http://git.uio.no/git/?a=blobdiff_plain;f=TPC%2FAliTPC.h;h=370bb84a473755a27c564832689d307231da5b92;hb=3b7e497e1b61ac8f867672db59acc92674ff0c69;hp=f43ff0af1cce6bb8b75d10713785a684a9c6b732;hpb=ac81c411286c9563e5afb0af3642890c7f28e79c;p=u%2Fmrichter%2FAliRoot.git

diff --git a/TPC/AliTPC.h b/TPC/AliTPC.h
index f43ff0af1cc..370bb84a473 100644
--- 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>
 
@@ -20,6 +21,8 @@ class AliTPCParam;
 class AliTPCTrackHits; // M.I.  -MI4 old hits - to be removed later
 class AliTPCTrackHitsV2; // M.I.
 class AliRawReader;
+class TTreeSRedirector;
+
 #include "AliDetector.h"
 #include "AliDigit.h" 
 #include "AliHit.h" 
@@ -30,16 +33,14 @@ class AliTPC : public AliDetector {
 public:
   AliTPC(); 
   AliTPC(const char *name, const char *title);
-  AliTPC(const AliTPC& t);
   
   virtual AliLoader* MakeLoader(const char* topfoldername);
   
   virtual      ~AliTPC();
   virtual void  AddHit(Int_t a1, Int_t *a2, Float_t *a3);
-  virtual void  BuildGeometry();
   virtual void  CreateGeometry() {}
   virtual void  CreateMaterials();
-  virtual void  AddAlignableVolumes() const {};
+  virtual void  AddAlignableVolumes() const {}
   
   virtual AliDigitizer* CreateDigitizer(AliRunDigitizer* manager) const;
   virtual void  SDigits2Digits(){;} //MI change -cycling to production
@@ -56,21 +57,20 @@ public:
   virtual void  Digits2Raw();
   virtual Bool_t Raw2SDigits(AliRawReader* rawReader);
   Int_t         GetNsectors() const  {return fNsectors;}
-  virtual void  MakeBranch(Option_t *opt=" ");
   virtual void  ResetDigits();
   virtual void  SetSens(Int_t sens);
   virtual void  SetSide(Float_t side);
 
 
   virtual void  StepManager()=0;
-  virtual void  DrawDetector() {}
+  virtual void  DrawDetector() const  {}
   AliTPCDigitsArray*  GetDigitsArray() {return fDigitsArray;} //MI change
   AliTPCParam *GetParam(){return fTPCParam;} // M.K, M.I changes
   void SetParam(AliTPCParam *param){fTPCParam=param;} // M.K, M.I changes
   void SetDigitsArray(AliTPCDigitsArray* param) {fDigitsArray=param;}  //MI change
 
 // additional function neccesary for the new hits 
-   virtual void MakeBranch2(Option_t *opt=" ", const char *file=0);  //
+   virtual void MakeBranch(Option_t *opt=" ");  //
    virtual void SetTreeAddress();
    virtual void SetTreeAddress2();
    virtual void AddHit2(Int_t a1,  Int_t *a2, Float_t *a3);  //
@@ -80,9 +80,6 @@ public:
    virtual AliHit* NextHit();
    virtual AliHit* FirstHit2(Int_t track);
    virtual AliHit* NextHit2();
-   virtual void LoadPoints(Int_t dummy);
-   virtual void LoadPoints2(Int_t dummy);
-   virtual void LoadPoints3(Int_t dumy);
    virtual void FinishPrimary();
    virtual void RemapTrackHitIDs(Int_t *map);
    void SetHitType(Int_t type){fHitType =type;} //set type of hit container
@@ -93,9 +90,11 @@ public:
    Bool_t  IsSectorActive(Int_t sec) const;    // check if the sector is active
    void    SetActiveSectors(Int_t * sectors, Int_t n);  //set active sectors
    Int_t GetHitType() const {return fHitType;}
-   void    SetActiveSectors(Int_t flag=0); //loop over al hits and set active only hitted sectors
+   void    SetActiveSectors(Int_t flag=1); //loop over al hits and set active only hitted sectors
    Bool_t  TrackInVolume(Int_t id,Int_t track);  //return true if current track is in volume
-
+   void    SetPrimaryIonisation(Bool_t flag = kTRUE) {fPrimaryIonisation = flag;}
+   void    SetGainFactor(Float_t gain){fGainFactor=gain;} //gas gain scaling factor
+   Float_t GetGainFactor()const {return fGainFactor;}//gas gain scaling factor
 // static functions
    static AliTPCParam* LoadTPCParam(TFile *file); 
 protected:
@@ -115,8 +114,10 @@ protected:
   //MK changes
 
   Float_t        fSide;  // selects left(-1), right(+1), or both(0) sides of the TPC
-   
+  Bool_t     fPrimaryIonisation; //switch between Fluka(true) and geant3(false)
  private:
+  AliTPC(const AliTPC& t);
+  AliTPC &operator = (const AliTPC & param);
   //
   void SetDefaults();
   void DigitizeRow(Int_t irow,Int_t isec,TObjArray **rowTriplet);
@@ -134,8 +135,9 @@ protected:
   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
+  Float_t    fGainFactor; // scaling factor
+  TTreeSRedirector *fDebugStreamer;     //!debug streamer
+  ClassDef(AliTPC,13)  // Time Projection Chamber class
 };
 
 
@@ -149,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;}
@@ -158,7 +160,7 @@ public:
 
    Float_t Time() const {return fTime;}
  
-   ClassDef(AliTPChit,2)  // Time Projection Chamber hits
+   ClassDef(AliTPChit,3)  // Time Projection Chamber hits
 };