Merge branch 'feature-movesplit'

[u/mrichter/AliRoot.git] / PWGGA / EMCALTasks / macros / ConfigureEMCALRecoUtils.C

diff --git a/PWGGA/EMCALTasks/macros/ConfigureEMCALRecoUtils.C b/PWGGA/EMCALTasks/macros/ConfigureEMCALRecoUtils.C
index 65e26c015e73d48d170f4127de3b9889bb7ab5db..e6be33a7f323a81950bff61d237cba6040a71ff8 100644 (file)
--- a/PWGGA/EMCALTasks/macros/ConfigureEMCALRecoUtils.C
+++ b/PWGGA/EMCALTasks/macros/ConfigureEMCALRecoUtils.C
@@ -21,9 +21,9 @@ void ConfigureEMCALRecoUtils(AliEMCALRecoUtils* reco,
     reco->SwitchOnRejectExoticCell() ;
     reco->SwitchOnRejectExoticCluster(); 
     
-    reco->SetExoticCellDiffTimeCut(10000);    // Open  
-    reco->SetExoticCellFractionCut(0.95);     // 1-Ecross/Ecell > 0.95 -> out
-    reco->SetExoticCellMinAmplitudeCut(0.75); // 750 MeV    
+    reco->SetExoticCellDiffTimeCut(50);     // If |t cell max - t cell in cross| > 50 do not add its energy 
+    reco->SetExoticCellFractionCut(0.97);   // 1-Ecross/Ecell > 0.97 -> out
+    reco->SetExoticCellMinAmplitudeCut(4.); // 4 GeV    
   }  
   
   //Recalibration factors
@@ -31,6 +31,7 @@ void ConfigureEMCALRecoUtils(AliEMCALRecoUtils* reco,
   if(bRecalE && ! bMC)
   {
     reco->SwitchOnRecalibration();
+    reco->SwitchOnRunDepCorrection();    
   } 
 
   // Remove EMCAL hot channels 
@@ -56,7 +57,21 @@ void ConfigureEMCALRecoUtils(AliEMCALRecoUtils* reco,
   
   if( bNonLin ) 
   { 
-    if(!kSimulation) reco->SetNonLinearityFunction(AliEMCALRecoUtils::kBeamTestCorrected);
-    else             reco->SetNonLinearityFunction(AliEMCALRecoUtils::kPi0MC);
+    if(!bMC)
+    {
+      printf("xxx SET Non linearity correction kBeamTestCorrected xxx\n");
+      reco->SetNonLinearityFunction(AliEMCALRecoUtils::kBeamTestCorrectedv2);
+    }
+    else
+    {       
+      printf("xxx SET Non linearity correction kPi0MCv3 xxx\n");
+      reco->SetNonLinearityFunction(AliEMCALRecoUtils::kPi0MCv3);
+    }
   }
+  else 
+  {
+    printf("xxx DON'T SET Non linearity correction xxx\n");
+    reco->SetNonLinearityFunction(AliEMCALRecoUtils::kNoCorrection);
+  }
+  
 }