Merge branch 'feature-movesplit'

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

diff --git a/PWGGA/EMCALTasks/macros/AddTaskEMCALPi0Calibration.C b/PWGGA/EMCALTasks/macros/AddTaskEMCALPi0Calibration.C
index 734b545da3361c7cf0a1a6293a2d952b3e61b831..519226161c5b31024b47a3a994c854629f77da0e 100644 (file)
--- a/PWGGA/EMCALTasks/macros/AddTaskEMCALPi0Calibration.C
+++ b/PWGGA/EMCALTasks/macros/AddTaskEMCALPi0Calibration.C
@@ -30,7 +30,6 @@ AliAnalysisTaskEMCALPi0CalibSelection * AddTaskEMCALPi0Calibration(TString outpu
   AliAnalysisDataContainer *cinput1  = mgr->GetCommonInputContainer();
   
   AliAnalysisTaskEMCALPi0CalibSelection * pi0calib = new AliAnalysisTaskEMCALPi0CalibSelection ("EMCALPi0Calibration");
-  pi0calib->SelectCollisionCandidates(); 
   //pi0calib->SetDebugLevel(10); 
   //pi0calib->UseFilteredEventAsInput();
   pi0calib->SetClusterMinEnergy(0.3);
@@ -40,7 +39,7 @@ AliAnalysisTaskEMCALPi0CalibSelection * AddTaskEMCALPi0Calibration(TString outpu
   pi0calib->SetClusterMinNCells(1);
   pi0calib->SetNCellsGroup(0);
   pi0calib->SwitchOnSameSM();
-  pi0calib->SetPairDTimeCut(40);
+  pi0calib->SetPairDTimeCut(20);
   pi0calib->SetClusterMinTime(560);
   pi0calib->SetClusterMaxTime(610);
 
@@ -48,8 +47,6 @@ AliAnalysisTaskEMCALPi0CalibSelection * AddTaskEMCALPi0Calibration(TString outpu
   
   // Cluster recalculation, Reco Utils configuration
   
-  pi0calib->SwitchOnClusterCorrection();
-
   
   AliEMCALRecoUtils * reco = pi0calib->GetEMCALRecoUtils();
   
@@ -61,14 +58,16 @@ AliAnalysisTaskEMCALPi0CalibSelection * AddTaskEMCALPi0Calibration(TString outpu
                           nonlin,
                           recalE, 
                           rmBad,
-                          recalT);   
+                          recalT); 
   
-  reco->SetNumberOfCellsFromEMCALBorder(1);
-
-  //reco->Print("");
+  reco->SetNumberOfCellsFromEMCALBorder(0); // Do not remove clusters in borders!
   
-  //cu->SwitchOnEMCALOADB();
-
+  // recalibrate energy and do corrections because of Temperature corrections 
+  pi0calib->SwitchOnClusterCorrection();
+  reco->SwitchOnRecalibration();
+  reco->SwitchOnRunDepCorrection();
+  
+  //reco->Print("");
   
   //---------------------
   // Geometry alignment
@@ -77,7 +76,7 @@ AliAnalysisTaskEMCALPi0CalibSelection * AddTaskEMCALPi0Calibration(TString outpu
   //pi0calib->SetGeometryName("EMCAL_COMPLETE12SMV1");
   pi0calib->SetGeometryName("EMCAL_COMPLETEV1");
 
-  pi0calib->SwitchOffLoadOwnGeometryMatrices();
+  pi0calib->SwitchOnLoadOwnGeometryMatrices();
   
   
   //---------------------
@@ -86,7 +85,6 @@ AliAnalysisTaskEMCALPi0CalibSelection * AddTaskEMCALPi0Calibration(TString outpu
   
   if(recalE)
   {
-    reco->SwitchOnRecalibration();
     TFile * f = new TFile("RecalibrationFactors.root","read");
     for(Int_t ism = 0; ism < 12; ism++)
     {