X-Git-Url: http://git.uio.no/git/?a=blobdiff_plain;f=TPC%2FAliTPC.h;h=7e51922960158ca735b254f6bcf647904a78cc4b;hb=40a0a69c6f8c4bc355d0217882c78f0f9b02c02b;hp=8c151fea74e8d0d1985aa40373fbf6ccadbf707a;hpb=b97617a6e77c5a0b1dd193c52610de90d6085fed;p=u%2Fmrichter%2FAliRoot.git

diff --git a/TPC/AliTPC.h b/TPC/AliTPC.h
index 8c151fea74e..7e519229601 100644
--- a/TPC/AliTPC.h
+++ b/TPC/AliTPC.h
@@ -18,9 +18,10 @@ class TTree;
 class AliTPCDigitsArray;
 class AliTPCLoader;
 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" 
@@ -33,15 +34,14 @@ public:
   AliTPC(const char *name, const char *title);
   
   virtual AliLoader* MakeLoader(const char* topfoldername);
-  
+  void          CreateDebugStremer();
   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 AliDigitizer* CreateDigitizer(AliRunDigitizer* manager) const;
+  virtual AliDigitizer* CreateDigitizer(AliDigitizationInput* digInput) const;
   virtual void  SDigits2Digits(){;} //MI change -cycling to production
   virtual void  SDigits2Digits2(Int_t eventnumber=0);
 
@@ -56,21 +56,19 @@ 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() {}
   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 +78,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 +88,13 @@ 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
+   // LHC clock phase switch 0 - no phase, 1 - random, 2 - from the OCDB
+   void SetLHCclockPhase(Int_t sw){fLHCclockPhaseSw = sw;}
 // static functions
    static AliTPCParam* LoadTPCParam(TFile *file); 
 protected:
@@ -116,7 +115,7 @@ protected:
 
   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:
+ protected:
   AliTPC(const AliTPC& t);
   AliTPC &operator = (const AliTPC & param);
   //
@@ -136,9 +135,10 @@ 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
+  Int_t fLHCclockPhaseSw; //! lhc clock phase switch
+  ClassDef(AliTPC,14)  // Time Projection Chamber class
 };