X-Git-Url: http://git.uio.no/git/?a=blobdiff_plain;f=PHOS%2FAliPHOSRecoParam.h;h=bd2c3a888d7192177c150181cf4836c70751b6db;hb=23778b28b6e1a8bc7cf51eeacab00f5dff69ecd8;hp=6ec974c35a1149997c829dd905939258b4ed9733;hpb=12dd7f101b82a90ade91560d13dbeb930b0833ca;p=u%2Fmrichter%2FAliRoot.git

diff --git a/PHOS/AliPHOSRecoParam.h b/PHOS/AliPHOSRecoParam.h
index 6ec974c35a1..bd2c3a888d7 100644
--- a/PHOS/AliPHOSRecoParam.h
+++ b/PHOS/AliPHOSRecoParam.h
@@ -8,6 +8,7 @@
 // Base class for the PHOS reconstruction parameters.
 // Do not use in the reconstruction; use derivative classes instead.
 
+#include "TArrayF.h"
 #include "AliDetectorRecoParam.h"
 
 class AliPHOSRecoParam : public AliDetectorRecoParam {
@@ -26,12 +27,19 @@ public:
   Float_t GetEMCLogWeight()           const { return fEMCW0;                   }
   Float_t GetEMCSampleQualityCut()    const { return fEMCSampleQualityCut;     }
   Float_t GetEMCEcoreRadius()         const { return fEMCEcoreRadius;          }
+  const Float_t * GetNonlinearityParams()   const { return fNonLinearityParams.GetArray() ;}
   Bool_t  EMCEcore2ESD()              const { return fEMCEcore2ESD;            }
   Bool_t  EMCSubtractPedestals()      const { return fEMCSubtractPedestals;    }
   Bool_t  EMCToUnfold()               const { return fEMCUnfold;               }
-  const char* EMCDecoderVersion()     const { return fEMCDecoderVersion.Data();}
+  const char* EMCFitterVersion()      const { return fEMCFitterVersion.Data(); }
   Bool_t  GetEMCEnergyCorrectionOn()  const { return fEMCEnergyCorrectionOn;   }
   Int_t   GetGlobalAltroOffset()      const { return fGlobalAltroOffset ;      }
+  Int_t   GetGlobalAltroThreshold()   const { return fGlobalAltroThreshold ;   }
+  Float_t GetTimeGateAmpThresh()      const { return fTimeGateAmpThresh ;      }
+  Float_t GetTimeGateLow()            const { return fTimeGateLow ;            }
+  Float_t GetTimeGateHigh()           const { return fTimeGateHigh ;           }
+
+  const char* GetNonlinearityCorrectionVersion()const{return fNonlinearityCorrVersion.Data();}
 
   Float_t GetCPVClusteringThreshold() const { return fCPVClusteringThreshold;  }
   Float_t GetCPVLocalMaxCut()         const { return fCPVLocMaxCut;            }
@@ -48,10 +56,17 @@ public:
   void SetEMCEcoreRadius(Float_t rCore)              { fEMCEcoreRadius        =rCore;   }
   void SetEMCEcore2ESD(Bool_t ecore)                 { fEMCEcore2ESD          =ecore;   }
   void SetEMCSubtractPedestals(Bool_t subtract)      { fEMCSubtractPedestals  =subtract;} 
-  void SetEMCDecoderVersion(const char* version="v1"){ fEMCDecoderVersion     =version ;}
+  void SetEMCFitterVersion(const char* version="v1") { fEMCFitterVersion     =version ; }
   void SetEMCUnfolding(Bool_t toUnfold=kFALSE)       { fEMCUnfold             =toUnfold;}
   void SetEMCEnergyCorrectionOn(Bool_t on=kTRUE)     { fEMCEnergyCorrectionOn =on;      }
+  //Make sure to set first version and then parameters, otherwise parameters will be overwritten by default ones.
+  void SetNonlinearityParams(Int_t n, Float_t * params){fNonLinearityParams.Set(n,params);}
   void SetGlobalAltroOffset(Int_t offset=5)          { fGlobalAltroOffset     =offset ; }
+  void SetGlobalAltroThreshold(Int_t ZSth=5)         { fGlobalAltroThreshold  =ZSth;    }
+  void SetTimeGateAmpThresh(Float_t thrs=10)         { fTimeGateAmpThresh     = thrs ;  }
+  void SetTimeGateLow(Float_t gate=1.e-7)            { fTimeGateLow = gate ;            }
+  void SetTimeGateHigh(Float_t gate=1.e-8)           { fTimeGateHigh = gate;            }
+  void SetNonlinearityCorrectionVersion(const char * ver="Gustavo2005");
 
   void SetCPVClusteringThreshold(Float_t cluth)      { fCPVClusteringThreshold=cluth;   }
   void SetCPVLocalMaxCut(Float_t cut)                { fCPVLocMaxCut          =cut;     }
@@ -63,22 +78,29 @@ public:
 
   static AliPHOSRecoParam* GetDefaultParameters();
   static const  TObjArray* GetMappings();
+  static const  TObject*   GetTriggerParameters();
 
 protected:
 
+  TArrayF fNonLinearityParams;     // EMC: Array of non-linearity correction parameters
   Float_t fEMCClusteringThreshold; // EMC: Min.digit energy to start a new cluster, in GeV
   Float_t fEMCLocMaxCut;           // EMC: Min.energy difference between two local maxima, in GeV
   Float_t fEMCRawDigitThreshold;   // EMC: Min.amplitude of a digit produced from raw data in ADC
   Float_t fEMCMinE;                // EMC: Min.E in the digits list associated with rec.point, in GeV
   Float_t fEMCW0;                  // EMC: Log.weight to evaluate a local coordinate of rec.point
   Float_t fEMCSampleQualityCut;    // EMC: Cut on pulse shape fit quality
+  Float_t fTimeGateAmpThresh ;     // EMC: Threshold for good/bad time calculation
+  Float_t fTimeGateLow ;           // EMC: Time difference between cells in PHOS cluster (bad time estimate)
+  Float_t fTimeGateHigh ;          // EMC: Time difference between cells in PHOS cluster (good time estimate)
   Float_t fEMCEcoreRadius;         // EMC: Radius within which the core energy is calculated, in cm
   Bool_t  fEMCEcore2ESD;           // EMC: true if Ecore is stored in ESD instead of Etot
   Bool_t  fEMCSubtractPedestals;   // EMC: true if pedestal should be subtracted (in non-ZS)
   Bool_t  fEMCUnfold;              // EMC: true if overlapped clusters should be unfolded
   Bool_t  fEMCEnergyCorrectionOn;  // EMC: if true do non-linear correction of cluster energy
-  TString fEMCDecoderVersion ;     // EMC: AliPHOSRawDecoder version
+  TString fEMCFitterVersion ;      // EMC: AliPHOSRawFitter version
+  TString fNonlinearityCorrVersion ;// EMC: choose which version of nenlinearity correction
   Int_t   fGlobalAltroOffset ;     // Offset used in ALTRO chips in SZ runs
+  Int_t   fGlobalAltroThreshold ;  // Threshold used in ALTRO chips in SZ runs
 
   Float_t fCPVClusteringThreshold; // CPV: Min.digit energy to start a new cluster, in GeV
   Float_t fCPVLocMaxCut;           // CPV: Min.energy difference between two local maxima, in GeV
@@ -87,8 +109,9 @@ protected:
   Bool_t  fCPVUnfold;              // CPV: true if overlapped clusters should be unfolded
 
   static TObjArray* fgkMaps;       // ALTRO mappings for RCU0..RCU3
+  static TObject* fgkTrigParams;   // PHOS trigger parameters
 
-  ClassDef(AliPHOSRecoParam,9)
+  ClassDef(AliPHOSRecoParam,12)
 };
 
 #endif