change the setting of the maximum number of super modules from the analysis class...

[u/mrichter/AliRoot.git] / PWGGA / CaloTrackCorrelations / macros / AddTaskShowerShapeStudies.C

diff --git a/PWGGA/CaloTrackCorrelations/macros/AddTaskShowerShapeStudies.C b/PWGGA/CaloTrackCorrelations/macros/AddTaskShowerShapeStudies.C
index 18a66003bd7988464ab660c5fafb6d05eb2f1dc8..6c73f263f56023417b280e34cbe360e7e4a26ed3 100644 (file)
--- a/PWGGA/CaloTrackCorrelations/macros/AddTaskShowerShapeStudies.C
+++ b/PWGGA/CaloTrackCorrelations/macros/AddTaskShowerShapeStudies.C
@@ -344,13 +344,13 @@ AliCaloTrackReader * ConfigureReader()
   
   if(kEventSelection)
   {
-    reader->SwitchOnEventSelection();         // remove pileup by default
+    reader->SwitchOnPileUpEventRejection();   // remove pileup by default
     reader->SwitchOnV0ANDSelection() ;        // and besides v0 AND
     reader->SwitchOnPrimaryVertexSelection(); // and besides primary vertex
   }
   else 
   {
-    reader->SwitchOffEventSelection();         // remove pileup by default
+    reader->SwitchOffPileUpRejection();        // remove pileup by default
     reader->SwitchOffV0ANDSelection() ;        // and besides v0 AND
     reader->SwitchOffPrimaryVertexSelection(); // and besides primary vertex    
   }
@@ -431,7 +431,19 @@ AliCalorimeterUtils* ConfigureCaloUtils()
   printf("ConfigureCaloUtils() - EMCAL Recalibration ON? %d %d\n",recou->IsRecalibrationOn(), cu->IsRecalibrationOn());
   printf("ConfigureCaloUtils() - EMCAL BadMap        ON? %d %d\n",recou->IsBadChannelsRemovalSwitchedOn(), cu->IsBadChannelsRemovalSwitchedOn());
   
-    
+  
+  if(kCalorimeter=="PHOS")
+  {
+    if (kYears <  2014) cu->SetNumberOfSuperModulesUsed(3);
+    else                cu->SetNumberOfSuperModulesUsed(4);
+  }
+  else
+  {
+    if      (kYears == 2010) cu->SetNumberOfSuperModulesUsed(4); //EMCAL first year
+    else if (kYears <  2014) cu->SetNumberOfSuperModulesUsed(10);
+    else                     cu->SetNumberOfSuperModulesUsed(20);
+  }
+  
   // PHOS 
   cu->SwitchOffLoadOwnPHOSGeometryMatrices();
     
@@ -734,17 +746,6 @@ AliAnaCalorimeterQA* ConfigureQAAnalysis()
   ana->SwitchOffStudyWeight();
   ana->SwitchOnFillAllTrackMatchingHistogram();
   
-  if(kCalorimeter=="EMCAL")
-  {
-    if     (kYears==2010)  ana->SetNumberOfModules(4); 
-    else if(kYears==2011)  ana->SetNumberOfModules(10);
-    else                   ana->SetNumberOfModules(12); 
-  }
-  else 
-  {//PHOS
-    ana->SetNumberOfModules(3); 
-  }
-  
   ana->AddToHistogramsName("QA_"); //Begining of histograms name
   SetHistoRangeAndNBins(ana->GetHistogramRanges()); // see method below