Add option to check the real acceptance of the calorimeters for MC particles

diff --git a/PWG/CaloTrackCorrBase/AliAnaCaloTrackCorrBaseClass.cxx b/PWG/CaloTrackCorrBase/AliAnaCaloTrackCorrBaseClass.cxx
index 2298380f784043d595a070d3680f841a18df4e04..1374363103018a624f3ff3cd92d7303fabf51353 100755 (executable)
--- a/PWG/CaloTrackCorrBase/AliAnaCaloTrackCorrBaseClass.cxx
+++ b/PWG/CaloTrackCorrBase/AliAnaCaloTrackCorrBaseClass.cxx
@@ -46,7 +46,8 @@ ClassImp(AliAnaCaloTrackCorrBaseClass)
 //__________________________________________________________
 AliAnaCaloTrackCorrBaseClass::AliAnaCaloTrackCorrBaseClass() : 
 TObject(), 
-fDataMC(0),                   fDebug(0),                   fCheckFidCut(0),
+fDataMC(0),                   fDebug(0),
+fCheckFidCut(0),              fCheckRealCaloAcc(0),
 fCheckCaloPID(0),             fRecalculateCaloPID(0), 
 fMinPt(0),                    fMaxPt(0),                   fPairTimeCut(200), 
 fMultiBin(0),                 fNZvertBin(0),
@@ -332,6 +333,8 @@ TString  AliAnaCaloTrackCorrBaseClass::GetBaseParametersList()
   parList+=onePar ;
   snprintf(onePar,buffersize,"fCheckFidCut=%d (Check Fiducial cut selection on/off) \n",fCheckFidCut) ;
   parList+=onePar ;
+  snprintf(onePar,buffersize,"fCheckRealCaloAcc=%d (Check Real Calo Acceptance on/off) \n",fCheckRealCaloAcc) ;
+  parList+=onePar ;
   snprintf(onePar,buffersize,"fCheckCaloPID =%d (Use Bayesian PID in calorimetes, on/off) \n",fCheckCaloPID) ;
   parList+=onePar ;
   snprintf(onePar,buffersize,"fRecalculateCaloPID  =%d (Calculate PID from shower/tof/tracking parameters, on/off) \n",fRecalculateCaloPID) ;
@@ -554,8 +557,9 @@ void AliAnaCaloTrackCorrBaseClass::InitParameters()
   fDebug               = -1;
   fCheckCaloPID        = kTRUE ;
   fCheckFidCut         = kFALSE ;
+  fCheckRealCaloAcc    = kFALSE ;
   fRecalculateCaloPID  = kFALSE ;
-  fMinPt               = 0.1  ; //Min pt in particle analysis
+  fMinPt               = 0.2  ; //Min pt in particle analysis
   fMaxPt               = 300. ; //Max pt in particle analysis
   fMultiBin            = 1;
   fNZvertBin           = 1;
@@ -584,22 +588,23 @@ void AliAnaCaloTrackCorrBaseClass::Print(const Option_t * opt) const
   if(! opt)
     return;
        
-  printf("New AOD:            =     %d\n",fNewAOD);
-  printf("Input AOD name:     =     %s\n",fInputAODName.Data());
-  printf("Output AOD name:    =     %s\n",fOutputAODName.Data());
-  printf("Output AOD Class name: =  %s\n",fOutputAODClassName.Data());
-  printf("Min Photon pT       =     %2.2f\n",  fMinPt) ;
-  printf("Max Photon pT       =     %3.2f\n",  fMaxPt) ;
-  printf("Check PID           =     %d\n",     fCheckCaloPID) ;
-  printf("Recalculate PID     =     %d\n",     fRecalculateCaloPID) ;
-  printf("Check Fiducial cut  =     %d\n",     fCheckFidCut) ;
-  printf("Check MC labels     =     %d\n",     fDataMC);
-  printf("Make plots?         =     %d \n",    fMakePlots);    
-  printf("Debug Level         =     %d\n",     fDebug);
-  
-  printf("Name of reference array      : %s\n", fAODObjArrayName.Data());      
+  printf("New AOD:            =     %d\n",      fNewAOD);
+  printf("Input AOD name:     =     %s\n",      fInputAODName.Data());
+  printf("Output AOD name:    =     %s\n",      fOutputAODName.Data());
+  printf("Output AOD Class name: =  %s\n",      fOutputAODClassName.Data());
+  printf("Name of reference array      : %s\n", fAODObjArrayName.Data());
   printf("String added histograms name : %s\n", fAddToHistogramsName.Data());
-       
+
+  printf("Min Photon pT       =     %2.2f\n", fMinPt) ;
+  printf("Max Photon pT       =     %3.2f\n", fMaxPt) ;
+  printf("Check PID           =     %d\n",    fCheckCaloPID) ;
+  printf("Recalculate PID     =     %d\n",    fRecalculateCaloPID) ;
+  printf("Check Fiducial cut  =     %d\n",    fCheckFidCut) ;
+  printf("Check Real Calo Acc =     %d\n",    fCheckRealCaloAcc) ;
+  printf("Check MC labels     =     %d\n",    fDataMC);
+  printf("Make plots?         =     %d\n",    fMakePlots);
+  printf("Debug Level         =     %d\n",    fDebug);
+  
   printf("    \n") ;
   
 } 

diff --git a/PWG/CaloTrackCorrBase/AliAnaCaloTrackCorrBaseClass.h b/PWG/CaloTrackCorrBase/AliAnaCaloTrackCorrBaseClass.h
index 99a5ace93bdb13e806d3282ac199f2c00770f6ca..f2698d5349018960e9228e47d891ad0d9c0fd9a5 100755 (executable)
--- a/PWG/CaloTrackCorrBase/AliAnaCaloTrackCorrBaseClass.h
+++ b/PWG/CaloTrackCorrBase/AliAnaCaloTrackCorrBaseClass.h
@@ -131,15 +131,22 @@ public:
   // Common analysis switchs 
   
   virtual Bool_t         IsDataMC()                        const { return fDataMC                ; }
-  virtual void           SwitchOnDataMC()                        { fDataMC = kTRUE ; if(!fMCUtils)fMCUtils = new AliMCAnalysisUtils();}
+  virtual void           SwitchOnDataMC()                        { fDataMC = kTRUE ;
+                                                                   if(!fMCUtils) fMCUtils = new AliMCAnalysisUtils() ; }
   virtual void           SwitchOffDataMC()                       { fDataMC = kFALSE              ; }
   
   virtual Bool_t         IsFiducialCutOn()                 const { return fCheckFidCut           ; }
-  virtual void           SwitchOnFiducialCut()                   { fCheckFidCut = kTRUE;  if(!fFidCut)fFidCut = new AliFiducialCut();}
+  virtual void           SwitchOnFiducialCut()                   { fCheckFidCut = kTRUE ;
+                                                                   if(!fFidCut)  fFidCut   = new AliFiducialCut()     ; }
   virtual void           SwitchOffFiducialCut()                  { fCheckFidCut = kFALSE         ; }
+
+  virtual Bool_t         IsRealCaloAcceptanceOn()          const { return fCheckRealCaloAcc      ; }
+  virtual void           SwitchOnRealCaloAcceptance()            { fCheckRealCaloAcc = kTRUE;  }
+  virtual void           SwitchOffRealCaloAcceptance()           { fCheckRealCaloAcc = kFALSE    ; }
   
   virtual Bool_t         IsCaloPIDOn()                     const { return fCheckCaloPID          ; }
-  virtual void           SwitchOnCaloPID()                       { fCheckCaloPID = kTRUE; if(!fCaloPID)fCaloPID = new AliCaloPID();}
+  virtual void           SwitchOnCaloPID()                       { fCheckCaloPID = kTRUE ;
+                                                                   if(!fCaloPID)  fCaloPID = new AliCaloPID()         ; }
   virtual void           SwitchOffCaloPID()                      { fCheckCaloPID = kFALSE        ; }
   
   virtual Bool_t         MakePlotsOn()                     const { return fMakePlots        ; }
@@ -290,7 +297,8 @@ private:
   
   Bool_t                     fDataMC ;             // Flag to access MC data when using ESD or AOD     
   Int_t                      fDebug ;              // Debug level
-  Bool_t                     fCheckFidCut ;        // Do analysis for clusters in defined region         
+  Bool_t                     fCheckFidCut ;        // Do analysis for clusters in defined region
+  Bool_t                     fCheckRealCaloAcc ;   // When analysis of MC particle kinematics, check their hit in Calorimeter in Real Geometry or use FidCut
   Bool_t                     fCheckCaloPID ;       // Do analysis for calorimeters
   Bool_t                     fRecalculateCaloPID ; // Recalculate PID or use PID weights in calorimeters
   Float_t                    fMinPt ;              // Maximum pt of (trigger) particles in the analysis
@@ -330,7 +338,7 @@ private:
   AliAnaCaloTrackCorrBaseClass(              const AliAnaCaloTrackCorrBaseClass & bc) ; // cpy ctor
   AliAnaCaloTrackCorrBaseClass & operator = (const AliAnaCaloTrackCorrBaseClass & bc) ; // cpy assignment
   
-  ClassDef(AliAnaCaloTrackCorrBaseClass,22)
+  ClassDef(AliAnaCaloTrackCorrBaseClass,23)
 } ;