X-Git-Url: http://git.uio.no/git/?a=blobdiff_plain;f=TPC%2FAliTPCParamSR.h;h=a914eb32d691f8bd212058da58c0089454bbab3b;hb=7e4d63b3c9b3a5e7187eecc960b3196e639c2966;hp=f288d9352a70fd7ca8207932d794f06f3ec30e3d;hpb=cc80f89ead2e03e663aa5c2e2330945097ba3ffd;p=u%2Fmrichter%2FAliRoot.git

diff --git a/TPC/AliTPCParamSR.h b/TPC/AliTPCParamSR.h
index f288d9352a7..a914eb32d69 100644
--- a/TPC/AliTPCParamSR.h
+++ b/TPC/AliTPCParamSR.h
@@ -8,17 +8,23 @@
 ////////////////////////////////////////////////
 //  Manager class for TPC parameters          //
 ////////////////////////////////////////////////
-#include "AliTPCPRF2D.h"
-#include "AliTPCRF1D.h"
 #include "AliTPCParam.h"
 
+class AliTPCRF1D;
+class AliTPCPRF2D;
+
 class AliTPCParamSR : public AliTPCParam {
 public:
   AliTPCParamSR();
+  AliTPCParamSR(const AliTPCParamSR &param); // copy constructor
+  AliTPCParamSR &operator = (const AliTPCParamSR & param); //assignment operator
   virtual ~AliTPCParamSR();
+
   Int_t  CalcResponse(Float_t* x, Int_t * index, Int_t row);
+  Int_t CalcResponseFast(Float_t* x, Int_t * index, Int_t row);
   //calculate bin response as function of the input position -x 
   //return number of valid response bin
+
   
   void XYZtoCRXYZ(Float_t *xyz, 
 		  Int_t &sector, Int_t &padrow, Int_t option=3) const;
@@ -36,15 +42,22 @@ public:
   Bool_t Update();            //recalculate and check geometric parameters 
   void SetDefault();          //set default parameters
   void   SetInnerPRF(AliTPCPRF2D * prf) {fInnerPRF = prf;}
-  void   SetOuterPRF(AliTPCPRF2D * prf) {fOuterPRF = prf;}
+  void   SetOuter1PRF(AliTPCPRF2D * prf) {fOuter1PRF = prf;} //e.k
+  void   SetOuter2PRF(AliTPCPRF2D * prf) {fOuter2PRF = prf;} //e.k
   void   SetTimeRF(AliTPCRF1D * timerf) {fTimeRF = timerf;}
 
   AliTPCPRF2D * GetInnerPRF() const {return fInnerPRF;}
-  AliTPCPRF2D * GetOuterPRF() const {return fOuterPRF;}
+  AliTPCPRF2D * GetOuter1PRF() const {return fOuter1PRF;} //e.k
+  AliTPCPRF2D * GetOuter2PRF() const {return fOuter2PRF;} //e.k
   AliTPCRF1D  * GetTimeRF()   const {return fTimeRF;}
-  void SetFacSigmaPadRow(Float_t fac) {fFacSigmaPadRow=fac;}
-  void SetFacSigmaPad(Float_t fac) {fFacSigmaPad=fac;}
-  void SetFacSigmaTime(Float_t fac) {fFacSigmaTime=fac;}
+  void SetFacSigmaPadRow(Float_t fac=3.) {fFacSigmaPadRow=fac;}
+  void SetFacSigmaPad(Float_t fac=3.) {fFacSigmaPad=fac;}
+  void SetFacSigmaTime(Float_t fac=3.) {fFacSigmaTime=fac;}
+
+  //  Float_t GetPadRowRadiiLow(Int_t irow) const;
+  //  Float_t GetPadRowRadiiUp(Int_t irow) const;
+  Float_t GetYInner(Int_t irow) const; //e,k
+  Float_t GetYOuter(Int_t irow) const; //e.k
 
   virtual Float_t GetPrimaryLoss(Float_t *x, Int_t *index, Float_t *angle);
   virtual Float_t GetTotalLoss(Float_t *x, Int_t *index, Float_t *angle);
@@ -55,13 +68,14 @@ public:
   virtual Float_t * GetAnglesAccMomentum(Float_t *x, Int_t * index, Float_t* momentum, Float_t *angle); 
  
 protected:
-  AliTPCPRF2D * fInnerPRF;         //pad response function object for inner sector
-  AliTPCPRF2D * fOuterPRF;         //pad response function object for inner sector  
+  AliTPCPRF2D * fInnerPRF;         //pad response function  for inner sector
+  AliTPCPRF2D * fOuter1PRF;        //pad response function  for outer sector  
+  AliTPCPRF2D * fOuter2PRF; 
   AliTPCRF1D  * fTimeRF;           //time response function object
   Float_t      fFacSigmaPadRow;    //factor-how many sigma of response I accept
-  Float_t      fFacSigmaPad;
-  Float_t      fFacSigmaTime; 
-  ClassDef(AliTPCParamSR,1)  //parameter  object for set:TPC
+  Float_t      fFacSigmaPad;       //factor-how many sigma of response I accept
+  Float_t      fFacSigmaTime;      //factor-how many sigma of response I accept
+  ClassDef(AliTPCParamSR,2)  //parameter  object for set:TPC
 };
 
 #endif