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

diff --git a/PWGGA/CaloTrackCorrelations/macros/AddTaskCaloTrackCorr.C b/PWGGA/CaloTrackCorrelations/macros/AddTaskCaloTrackCorr.C
index 9c41a35df1cc6fd04b5ae78bea262f3adc0fd173..6828dffe9af9231dcf8da727fdf58fa657e3b5d1 100644 (file)
--- a/PWGGA/CaloTrackCorrelations/macros/AddTaskCaloTrackCorr.C
+++ b/PWGGA/CaloTrackCorrelations/macros/AddTaskCaloTrackCorr.C
@@ -576,7 +576,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();
     
@@ -1453,17 +1465,6 @@ AliAnaCalorimeterQA* ConfigureQAAnalysis()
   ana->SwitchOffStudyWeight();
   ana->SwitchOnFillAllTrackMatchingHistogram();
   ana->SwitchOnFillAllCellTimeHisto() ;
-
-  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

diff --git a/PWGGA/CaloTrackCorrelations/macros/AddTaskCaloTrackCorrM.C b/PWGGA/CaloTrackCorrelations/macros/AddTaskCaloTrackCorrM.C
index 8c2f04de63d28319481d6ddda9412ef7ad2c06d9..7dc43eff254b2a34a2468ce276cfe725cb3b73b5 100644 (file)
--- a/PWGGA/CaloTrackCorrelations/macros/AddTaskCaloTrackCorrM.C
+++ b/PWGGA/CaloTrackCorrelations/macros/AddTaskCaloTrackCorrM.C
@@ -169,8 +169,7 @@ AliAnalysisTaskCaloTrackCorrelationM *AddTaskCaloTrackCorrM(TString data, TStrin
     anapi0->SetMultiplicity(80, 120);
     anapi0->SetMultiBin(1);  
     anapi0->SwitchOffDataMC() ;//Access MC stack and fill more histograms
-    if(calorimeter=="PHOS") anapi0->SetNumberOfModules(3); //PHOS first year
-    else if(calorimeter=="EMCAL") anapi0->SetNumberOfModules(4); //EMCAL first year
+ 
     anapi0->GetHistogramRanges()->SetHistoPtRangeAndNBins(0, 50, 100) ;
     //anapi0->GetHistogramRanges()->SetHistoPhiRangeAndNBins(0, TMath::TwoPi(), 100) ;
     //anapi0->GetHistogramRanges()->SetHistoEtaRangeAndNBins(-0.8, 0.8, 200) ;

diff --git a/PWGGA/CaloTrackCorrelations/macros/AddTaskIsoPhoton.C b/PWGGA/CaloTrackCorrelations/macros/AddTaskIsoPhoton.C
index e15df7eb823a64fe47181e5eea64cec0e03ddb84..f948d85743e7e25baf503d9332f71bf84d7baf81 100644 (file)
--- a/PWGGA/CaloTrackCorrelations/macros/AddTaskIsoPhoton.C
+++ b/PWGGA/CaloTrackCorrelations/macros/AddTaskIsoPhoton.C
@@ -343,7 +343,6 @@ AliCalorimeterUtils* ConfigureCaloUtils(Bool_t nonlin = kTRUE, Bool_t exotic = k
                           kFALSE); // time calib
   if(timecut) recou->SetExoticCellDiffTimeCut(50.);
 
-  
   if( nonlin)
   { 
     printf("ConfigureCaloUtils() - Apply non linearity to EMCAL\n");
@@ -353,10 +352,8 @@ AliCalorimeterUtils* ConfigureCaloUtils(Bool_t nonlin = kTRUE, Bool_t exotic = k
   printf("ConfigureCaloUtils() - EMCAL Recalibration ON? %d %d\n",recou->IsRecalibrationOn(), cu->IsRecalibrationOn());
   printf("ConfigureCaloUtils() - EMCAL BadMap        ON? %d %d\n",recou->IsBadChannelsRemovalSwitchedOn(), cu->IsBadChannelsRemovalSwitchedOn());
   
-    
-  // PHOS 
-  cu->SwitchOffLoadOwnPHOSGeometryMatrices();
-    
+  cu->SetNumberOfSuperModulesUsed(10);
+
   if(print) cu->Print("");
   
   return cu;
@@ -582,14 +579,6 @@ AliAnaCalorimeterQA* ConfigureQAAnalysis(TString calorimeter = "EMCAL", Bool_t s
   ana->SwitchOnFillAllTrackMatchingHistogram();
   ana->SwitchOnFillAllCellTimeHisto() ;
 
-  if(calorimeter=="EMCAL")
-  {
-    ana->SetNumberOfModules(10);
-  }
-  else 
-  {//PHOS
-    ana->SetNumberOfModules(3); 
-  }
   
   ana->AddToHistogramsName("QA_"); //Begining of histograms name
   SetHistoRangeAndNBins(ana->GetHistogramRanges(),calorimeter); // see method below

diff --git a/PWGGA/CaloTrackCorrelations/macros/AddTaskPi0.C b/PWGGA/CaloTrackCorrelations/macros/AddTaskPi0.C
index b933a42b606c0ec47f69869349f64e4ff6e7141f..490b3fa3598e95bc03230f1b3e4ee60430ea3af8 100644 (file)
--- a/PWGGA/CaloTrackCorrelations/macros/AddTaskPi0.C
+++ b/PWGGA/CaloTrackCorrelations/macros/AddTaskPi0.C
@@ -444,6 +444,17 @@ AliCalorimeterUtils* ConfigureCaloUtils()
     cu->SwitchOnCorrectClusterLinearity();
   }
   
+  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();
@@ -591,13 +602,6 @@ AliAnaPi0* ConfigurePi0Analysis()
   
   // Calorimeter settings
   ana->SetCalorimeter(kCalorimeter);
-  if(kCalorimeter=="PHOS") ana->SetNumberOfModules(3); //PHOS first year
-  else 
-  {                   
-    if     (kYears == 2010) ana->SetNumberOfModules( 4); // EMCAL first year
-    else if(kYears == 2011) ana->SetNumberOfModules(10); // Second year
-    else                    ana->SetNumberOfModules(12);
-  }
   
   //settings for pp collision mixing
   ana->SwitchOnOwnMix(); //Off when mixing done with general mixing frame
@@ -755,17 +759,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
   

diff --git a/PWGGA/CaloTrackCorrelations/macros/AddTaskPi0EMCALPbPb.C b/PWGGA/CaloTrackCorrelations/macros/AddTaskPi0EMCALPbPb.C
index 46b2614519e7ebc0dd1ec2d2f465e433a98aa69a..f8403414833ea4f7e8f4f14d01afdcf202047fb8 100644 (file)
--- a/PWGGA/CaloTrackCorrelations/macros/AddTaskPi0EMCALPbPb.C
+++ b/PWGGA/CaloTrackCorrelations/macros/AddTaskPi0EMCALPbPb.C
@@ -241,6 +241,19 @@ AliCalorimeterUtils* ConfigureCaloUtils(Int_t kYears, TString kCollisions, TStri
   if(kClusterArray == "") recou->SwitchOnRejectExoticCluster();
   else                    recou->SwitchOffRejectExoticCluster();
   
+  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);
+  }
+
+  
   if(kPrint) cu->Print("");
   
   return cu;
@@ -349,11 +362,6 @@ AliAnaPi0* ConfigurePi0Analysis(TString kData, TString kCalorimeter, Int_t kYear
   
   // Calorimeter settings
   anapi0->SetCalorimeter(kCalorimeter);
-  if(kCalorimeter=="PHOS") anapi0->SetNumberOfModules(3); //PHOS first year
-  else {                   
-    if(kYears==2010) anapi0->SetNumberOfModules(4); //EMCAL first year
-    else             anapi0->SetNumberOfModules(10);
-  }
   
   //settings for pp collision mixing
   anapi0->SwitchOnOwnMix(); //Off when mixing done with general mixing frame

diff --git a/PWGGA/CaloTrackCorrelations/macros/AddTaskShowerShapeStudies.C b/PWGGA/CaloTrackCorrelations/macros/AddTaskShowerShapeStudies.C
index 16e0efb1a26fbf9899e620a722b047cd43c4a21b..6c73f263f56023417b280e34cbe360e7e4a26ed3 100644 (file)
--- a/PWGGA/CaloTrackCorrelations/macros/AddTaskShowerShapeStudies.C
+++ b/PWGGA/CaloTrackCorrelations/macros/AddTaskShowerShapeStudies.C
@@ -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
   

diff --git a/PWGGA/CaloTrackCorrelations/macros/QA/AddTaskCalorimeterQA.C b/PWGGA/CaloTrackCorrelations/macros/QA/AddTaskCalorimeterQA.C
index 48585daf557fd4cb26712cd7bea889f9fc1a2552..efacaf1ba945d8318f8564cdfe9b0a6adb560dd4 100644 (file)
--- a/PWGGA/CaloTrackCorrelations/macros/QA/AddTaskCalorimeterQA.C
+++ b/PWGGA/CaloTrackCorrelations/macros/QA/AddTaskCalorimeterQA.C
@@ -90,6 +90,10 @@ AliAnalysisTaskCaloTrackCorrelation *AddTaskCalorimeterQA(const char *suffix="de
   // Remove clusters close to borders, at least max energy cell is 1 cell away 
   cu->SetNumberOfCellsFromEMCALBorder(1);
 
+  if      (year == 2010) cu->SetNumberOfSuperModulesUsed(4); //EMCAL first year
+  else if (year <  2014) cu->SetNumberOfSuperModulesUsed(10);
+  else                   cu->SetNumberOfSuperModulesUsed(20);
+  
   AliEMCALRecoUtils* reco = cu->GetEMCALRecoUtils();
   reco->SwitchOnRejectExoticCell() ; // reject exotic cells, fill different histograms for exotic clusters and good clusters
   reco->SetExoticCellDiffTimeCut(10000); // Open  
@@ -130,22 +134,19 @@ AliAnalysisTaskCaloTrackCorrelation *AddTaskCalorimeterQA(const char *suffix="de
   
   if     (year==2010)
   {  
-    emcalQA->SetNumberOfModules(4); 
     emcalQA->GetHistogramRanges()->SetHistoPhiRangeAndNBins(79*TMath::DegToRad(), 121*TMath::DegToRad(), 200) ;
     emcalQA->GetHistogramRanges()->SetHistoXRangeAndNBins(-230,90,120);
     emcalQA->GetHistogramRanges()->SetHistoYRangeAndNBins(370,450,40);
   }
-  else if(year==2011)
+  else if(year==2011 || year==2012)
   {            
-    emcalQA->SetNumberOfModules(10); 
     emcalQA->GetHistogramRanges()->SetHistoPhiRangeAndNBins(79*TMath::DegToRad(), 191*TMath::DegToRad(), 200) ;
     emcalQA->GetHistogramRanges()->SetHistoXRangeAndNBins(-600,90,200);
     emcalQA->GetHistogramRanges()->SetHistoYRangeAndNBins(100,450,100);
   }
   else 
   {
-    emcalQA->SetNumberOfModules(12); 
-    emcalQA->GetHistogramRanges()->SetHistoPhiRangeAndNBins(79*TMath::DegToRad(), 181*TMath::DegToRad(), 200) ; // revise
+    emcalQA->GetHistogramRanges()->SetHistoPhiRangeAndNBins(79*TMath::DegToRad(), 320*TMath::DegToRad(), 400) ; // revise
     emcalQA->GetHistogramRanges()->SetHistoXRangeAndNBins(-700,90,200); // revise
     emcalQA->GetHistogramRanges()->SetHistoYRangeAndNBins(50,450,100);  // revise     
   }

diff --git a/PWGGA/CaloTrackCorrelations/macros/QA/AddTaskPi0IMGammaCorrQA.C b/PWGGA/CaloTrackCorrelations/macros/QA/AddTaskPi0IMGammaCorrQA.C
index 81822d5183514a2983f81484962bee58351eef89..bd77dd128ce9d52baf021b17db0b9596c8fe1c37 100644 (file)
--- a/PWGGA/CaloTrackCorrelations/macros/QA/AddTaskPi0IMGammaCorrQA.C
+++ b/PWGGA/CaloTrackCorrelations/macros/QA/AddTaskPi0IMGammaCorrQA.C
@@ -276,6 +276,11 @@ AliCalorimeterUtils* ConfigureCaloUtils(Bool_t simulation, Int_t debugLevel)
 
   cu->SwitchOnCorrectClusterLinearity();
 
+  if(kCalorimeter=="PHOS")
+    cu->SetNumberOfSuperModulesUsed(3);
+  else
+    cu->SetNumberOfSuperModulesUsed(10);
+  
   // PHOS 
   cu->SwitchOffLoadOwnPHOSGeometryMatrices();
     
@@ -378,14 +383,6 @@ AliAnaPi0* ConfigurePi0Analysis(TString calorimeter, TString collision,
   
   // Calorimeter settings
   ana->SetCalorimeter(calorimeter);
-  if(calorimeter=="PHOS") ana->SetNumberOfModules(3); //PHOS first year
-  else 
-  {                   
-//    if     (year == 2010) ana->SetNumberOfModules( 4); // EMCAL first year
-//    else if(year == 2011) ana->SetNumberOfModules(10); // Second year
-//    else                    ana->SetNumberOfModules(12);
-    ana->SetNumberOfModules(12);
-  }
   
   //settings for pp collision mixing
   ana->SwitchOnOwnMix(); //Off when mixing done with general mixing frame
@@ -570,18 +567,6 @@ AliAnaCalorimeterQA* ConfigureQAAnalysis(TString calorimeter,  Bool_t simulation
   ana->SwitchOnFillAllTrackMatchingHistogram();
   ana->SwitchOnFillAllCellTimeHisto() ;
   
-  if(calorimeter=="EMCAL")
-  {
-//    if     (year==2010)  ana->SetNumberOfModules(4); 
-//    else if(year==2011)  ana->SetNumberOfModules(10);
-//    else
-    ana->SetNumberOfModules(12);
-  }
-  else 
-  {//PHOS
-    ana->SetNumberOfModules(3); 
-  }
-  
   ana->AddToHistogramsName("QA_"); //Begining of histograms name
   SetHistoRangeAndNBins(ana->GetHistogramRanges(),calorimeter); // see method below