X-Git-Url: http://git.uio.no/git/?a=blobdiff_plain;f=EMCAL%2FAliEMCALRecoUtils.h;h=c3c7e492facebb879d5123cc79e5f9e3ead5d35b;hb=3211986c91c34075890b218df1e57893eed22f8d;hp=206cff60764650b12039ebe44260b283f6e18bd0;hpb=dda65b42746ffe8d52ff26cbc6a5dc19ac387c37;p=u%2Fmrichter%2FAliRoot.git

diff --git a/EMCAL/AliEMCALRecoUtils.h b/EMCAL/AliEMCALRecoUtils.h
index 206cff60764..c3c7e492fac 100644
--- a/EMCAL/AliEMCALRecoUtils.h
+++ b/EMCAL/AliEMCALRecoUtils.h
@@ -49,7 +49,7 @@ public:
   void     Print(const Option_t*) const;
 
   //enums
-  enum     NonlinearityFunctions{kPi0MC=0,kPi0GammaGamma=1,kPi0GammaConversion=2,kNoCorrection=3,kBeamTest=4,kBeamTestCorrected=5};
+  enum     NonlinearityFunctions{kPi0MC=0,kPi0GammaGamma=1,kPi0GammaConversion=2,kNoCorrection=3,kBeamTest=4,kBeamTestCorrected=5,kPi0MCv2=6,kPi0MCv3=7};
   enum     PositionAlgorithms{kUnchanged=-1,kPosTowerIndex=0, kPosTowerGlobal=1};
   enum     ParticleType{kPhoton=0, kElectron=1,kHadron =2, kUnknown=-1};
   enum     { kNCuts = 11 }; //track matching
@@ -162,11 +162,11 @@ public:
     ((TH2F*)fEMCALRecalibrationFactors->At(iSM))->SetBinContent(iCol,iRow,c) ; }
   
   //Recalibrate channels energy with run dependent corrections
+  Bool_t   IsRunDepRecalibrationOn()               const { return fUseRunCorrectionFactors ; }
+
   void     SwitchOffRunDepCorrection()                   { fUseRunCorrectionFactors = kFALSE ; }
   void     SwitchOnRunDepCorrection()                    { fUseRunCorrectionFactors = kTRUE  ; 
-                                                           SwitchOnRecalibration()           ; }
-  void     SetRunDependentCorrections(Int_t runnumber);
-      
+                                                           SwitchOnRecalibration()           ; }      
   // Time Recalibration  
   void     RecalibrateCellTime(const Int_t absId, const Int_t bc, Double_t & time) const;
   
@@ -316,8 +316,15 @@ public:
   Bool_t   IsExoticCell(const Int_t absId, AliVCaloCells* cells, const Int_t bc =-1) ;
   void     SwitchOnRejectExoticCell()                 { fRejectExoticCells = kTRUE     ; }
   void     SwitchOffRejectExoticCell()                { fRejectExoticCells = kFALSE    ; } 
-  Bool_t   IsRejectExoticCell()                 const { return fRejectExoticCells    ; }
+  Bool_t   IsRejectExoticCell()                 const { return fRejectExoticCells      ; }
    
+  Float_t  GetECross(const Int_t absID, const Double_t tcell,
+                     AliVCaloCells* cells, const Int_t bc);
+  
+  Float_t  GetExoticCellFractionCut()           const { return fExoticCellFraction     ; }
+  Float_t  GetExoticCellDiffTimeCut()           const { return fExoticCellDiffTime     ; }
+  Float_t  GetExoticCellMinAmplitudeCut()       const { return fExoticCellMinAmplitude ; }
+  
   void     SetExoticCellFractionCut(Float_t f)        { fExoticCellFraction     = f    ; }
   void     SetExoticCellDiffTimeCut(Float_t dt)       { fExoticCellDiffTime     = dt   ; }
   void     SetExoticCellMinAmplitudeCut(Float_t ma)   { fExoticCellMinAmplitude = ma   ; }
@@ -395,7 +402,6 @@ private:
   
   // Recalibrate with run dependent corrections, energy
   Bool_t     fUseRunCorrectionFactors;   // Use Run Dependent Correction
-  Bool_t     fRunCorrectionFactorsSet;   // Run Correction set at leat once
     
   // Bad Channels
   Bool_t     fRemoveBadChannels;         // Check the channel status provided and remove clusters with bad channels