addapt to new naming of task, new paths of macros and new settings in caloQA

diff --git a/PWGGA/CaloTrackCorrelations/macros/AddTaskCaloTrackCorr.C b/PWGGA/CaloTrackCorrelations/macros/AddTaskCaloTrackCorr.C
index 610544b761e011c796759db7c6e9a6f989e028aa..e3022349860d5f532ac7e5550671802674ec9388 100644 (file)
--- a/PWGGA/CaloTrackCorrelations/macros/AddTaskCaloTrackCorr.C
+++ b/PWGGA/CaloTrackCorrelations/macros/AddTaskCaloTrackCorr.C
@@ -26,7 +26,7 @@ AliAnalysisTaskCaloTrackCorrelation *AddTaskCaloTrackCorr(
                                                     const TString clustersArray = "V1" 
                                                     )
 {
-  // Creates a PartCorr task, configures it and adds it to the analysis manager.
+  // Creates a CaloTrackCorr task, configures it and adds it to the analysis manager.
   
   kPrint         = printSettings;
   kSimulation    = simulation;
@@ -220,8 +220,8 @@ AliCaloTrackReader * ConfigureReader()
   // Tracks
   reader->SwitchOnCTS();
   if(kInputDataType=="ESD"){
-    gROOT->LoadMacro("$ALICE_ROOT/PWG4/macros/CreateTrackCutsPWG4.C"); 
-    AliESDtrackCuts * esdTrackCuts = CreateTrackCutsPWG4(10041004);   //no ITSrefit
+    gROOT->LoadMacro("$ALICE_ROOT/PWGJE/macros/CreateTrackCutsPWGJE.C"); 
+    AliESDtrackCuts * esdTrackCuts = CreateTrackCutsPWGJE(10041004);   //no ITSrefit
     reader->SetTrackCuts(esdTrackCuts);
   }
   else if(kInputDataType=="AOD"){
@@ -332,7 +332,7 @@ AliCalorimeterUtils* ConfigureCaloUtils()
     cu->SwitchOnRecalibration();      // Check the reader if it is taken into account during filtering
     
     TGeoHMatrix* matrix[12];
-    gROOT->LoadMacro("ConfigureEMCALRecoUtils.C");
+    gROOT->LoadMacro("$ALICE_ROOT/PWGGA/EMCALTasks/macros/ConfigureEMCALRecoUtils.C");
     ConfigureEMCALRecoUtils(
                             recou,
                             kSimulation, 

diff --git a/PWGGA/CaloTrackCorrelations/macros/QA/AddTaskCalorimeterQA.C b/PWGGA/CaloTrackCorrelations/macros/QA/AddTaskCalorimeterQA.C
index 029c57410b2951cdef2dd940450daff4bb8b396d..4a47f21324e01b6f834595a8689f06a94f8b11e5 100644 (file)
--- a/PWGGA/CaloTrackCorrelations/macros/QA/AddTaskCalorimeterQA.C
+++ b/PWGGA/CaloTrackCorrelations/macros/QA/AddTaskCalorimeterQA.C
@@ -69,9 +69,15 @@ AliAnalysisTaskCaloTrackCorrelation *AddTaskCalorimeterQA(TString data,
   AliCalorimeterUtils *cu = new AliCalorimeterUtils;
   // Remove clusters close to borders, at least max energy cell is 1 cell away 
   cu->SetNumberOfCellsFromEMCALBorder(1);
-  if(year==2010) cu->SetEMCALGeometryName("EMCAL_FIRSTYEARV1");
-  else           cu->SetEMCALGeometryName("EMCAL_COMPLETEV1"); 
-
+  if     (year==2010) cu->SetEMCALGeometryName("EMCAL_FIRSTYEARV1");
+  else if(year==2011) cu->SetEMCALGeometryName("EMCAL_COMPLETEV1"); 
+  else                cu->SetEMCALGeometryName("EMCAL_COMPLETE12SMV1"); 
+  
+  AliEMCALRecoUtils* reco = cu->GetEMCALRecoUtils();
+  reco->SwitchOnRejectExoticCell() ; // reject exotic cells, fill different histograms for exotic clusters and good clusters
+  reco->SetExoticCellDiffTimeCut(10000); // Open  
+  reco->SetExoticCellFractionCut(0.95);  // 1-Ecross/Ecell > 0.95 -> out
+  reco->SetExoticCellMinAmplitudeCut(0.75); // 750 MeV    
   
   cu->SetDebug(-1);
   if(kPrintSettings) cu->Print("");    
@@ -88,44 +94,55 @@ AliAnalysisTaskCaloTrackCorrelation *AddTaskCalorimeterQA(TString data,
   emcalQA->SwitchOnCorrelation();
   emcalQA->SwitchOffFillAllTH3Histogram();
   emcalQA->SwitchOffFillAllPositionHistogram();
+  emcalQA->SwitchOffFillAllPositionHistogram2();
+  emcalQA->SwitchOnStudyBadClusters();
 
   //Set Histrograms bins and ranges
-  emcalQA->SetHistoPtRangeAndNBins(0, 100, 200) ;
-  emcalQA->SetHistoFinePtRangeAndNBins(0, 10, 200) ; // bining for fhAmpId
-  emcalQA->SetHistoEtaRangeAndNBins(-0.71, 0.71, 200) ;
+  emcalQA->GetHistogramRanges()->SetHistoPtRangeAndNBins(0, 100, 200) ;
+  emcalQA->GetHistogramRanges()->SetHistoFinePtRangeAndNBins(0, 10, 200) ; // bining for fhAmpId
+  emcalQA->GetHistogramRanges()->SetHistoEtaRangeAndNBins(-0.71, 0.71, 200) ;
   
-  if(year==2010){  
+  if     (year==2010)
+  {  
     emcalQA->SetNumberOfModules(4); 
-    emcalQA->SetHistoPhiRangeAndNBins(79*TMath::DegToRad(), 121*TMath::DegToRad(), 200) ;
-    emcalQA->SetHistoXRangeAndNBins(-230,90,120);
-    emcalQA->SetHistoYRangeAndNBins(370,450,40);
+    emcalQA->GetHistogramRanges()->SetHistoPhiRangeAndNBins(79*TMath::DegToRad(), 121*TMath::DegToRad(), 200) ;
+    emcalQA->GetHistogramRanges()->SetHistoXRangeAndNBins(-230,90,120);
+    emcalQA->GetHistogramRanges()->SetHistoYRangeAndNBins(370,450,40);
   }
-  else{            
+  else if(year==2011)
+  {            
     emcalQA->SetNumberOfModules(10); 
-    emcalQA->SetHistoPhiRangeAndNBins(79*TMath::DegToRad(), 181*TMath::DegToRad(), 200) ;
-    emcalQA->SetHistoXRangeAndNBins(-600,90,200);
-    emcalQA->SetHistoYRangeAndNBins(100,450,100);
+    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()->SetHistoXRangeAndNBins(-700,90,200); // revise
+    emcalQA->GetHistogramRanges()->SetHistoYRangeAndNBins(50,450,100);  // revise     
   }
   
-  emcalQA->SetHistoMassRangeAndNBins(0., 1, 400) ;
-  emcalQA->SetHistoAsymmetryRangeAndNBins(0., 1. , 10 );
-  emcalQA->SetHistoPOverERangeAndNBins(0,10.,100);
-  emcalQA->SetHistodEdxRangeAndNBins(0.,200.,200);
-  emcalQA->SetHistodRRangeAndNBins(0.,TMath::Pi(),150);
-  emcalQA->SetHistoTimeRangeAndNBins(300.,900,300);
-  emcalQA->SetHistoRatioRangeAndNBins(0.,2.,100);
-  emcalQA->SetHistoVertexDistRangeAndNBins(0.,500.,500);
-  emcalQA->SetHistoNClusterCellRangeAndNBins(0,500,500);
-  emcalQA->SetHistoZRangeAndNBins(-400,400,200);
-  emcalQA->SetHistoRRangeAndNBins(400,450,25);
-  emcalQA->SetHistoV0SignalRangeAndNBins(0,5000,500);
-  emcalQA->SetHistoV0MultiplicityRangeAndNBins(0,5000,500);
-  emcalQA->SetHistoTrackMultiplicityRangeAndNBins(0,5000,500);
+  emcalQA->GetHistogramRanges()->SetHistoMassRangeAndNBins(0., 1, 400) ;
+  emcalQA->GetHistogramRanges()->SetHistoAsymmetryRangeAndNBins(0., 1. , 10 );
+  emcalQA->GetHistogramRanges()->SetHistoPOverERangeAndNBins(0,10.,100);
+  emcalQA->GetHistogramRanges()->SetHistodEdxRangeAndNBins(0.,200.,200);
+  emcalQA->GetHistogramRanges()->SetHistodRRangeAndNBins(0.,TMath::Pi(),150);
+  emcalQA->GetHistogramRanges()->SetHistoTimeRangeAndNBins(300.,900,300);
+  emcalQA->GetHistogramRanges()->SetHistoRatioRangeAndNBins(0.,2.,100);
+  emcalQA->GetHistogramRanges()->SetHistoVertexDistRangeAndNBins(0.,500.,500);
+  emcalQA->GetHistogramRanges()->SetHistoNClusterCellRangeAndNBins(0,500,500);
+  emcalQA->GetHistogramRanges()->SetHistoZRangeAndNBins(-400,400,200);
+  emcalQA->GetHistogramRanges()->SetHistoRRangeAndNBins(400,450,25);
+  emcalQA->GetHistogramRanges()->SetHistoV0SignalRangeAndNBins(0,5000,500);
+  emcalQA->GetHistogramRanges()->SetHistoV0MultiplicityRangeAndNBins(0,5000,500);
+  emcalQA->GetHistogramRanges()->SetHistoTrackMultiplicityRangeAndNBins(0,5000,500);
        
   if(kPrintSettings) emcalQA->Print("");       
   
   // #### Configure Maker ####
-  AliAnaPartCorrMaker * maker = new AliAnaPartCorrMaker();
+  AliAnaCaloTrackCorrMaker * maker = new AliAnaCaloTrackCorrMaker();
   maker->SetReader(reader);//pointer to reader
   maker->SetCaloUtils(cu); //pointer to calorimeter utils
   maker->AddAnalysis(emcalQA,0);

diff --git a/PWGGA/CaloTrackCorrelations/macros/QA/ana.C b/PWGGA/CaloTrackCorrelations/macros/QA/ana.C
index df324686e60a5c77b61fe0990bbb52d1d24d9b76..98036236116d93737be54e2eab434b3a0dd4e90f 100644 (file)
--- a/PWGGA/CaloTrackCorrelations/macros/QA/ana.C
+++ b/PWGGA/CaloTrackCorrelations/macros/QA/ana.C
@@ -137,7 +137,7 @@ void ana(Int_t mode=mLocal)
     mgr->ConnectOutput (counterINT, 1, coutputINT);
     
     
-    gROOT->LoadMacro("$ALICE_ROOT/PWG4/macros/QA/AddTaskCalorimeterQA.C");
+    gROOT->LoadMacro("$ALICE_ROOT/PWGGA/CaloTrackCorrelations/macros/QA/AddTaskCalorimeterQA.C");
     AliAnalysisTaskCaloTrackCorrelation *taskQAEMC = AddTaskCalorimeterQA(kInputData,2011,kFALSE,kMC,"","kEMC7");
     taskQAEMC->SelectCollisionCandidates(AliVEvent::kEMC7);
     AliAnalysisTaskCaloTrackCorrelation *taskQAINT = AddTaskCalorimeterQA(kInputData,2011,kFALSE,kMC,"","kINT7");

diff --git a/PWGGA/CaloTrackCorrelations/macros/ana.C b/PWGGA/CaloTrackCorrelations/macros/ana.C
index 3832cf8c50a8d4675d2b386c6137d29fe21caaa1..f601b0738a873e3c64d2b8587553b89f40ef9dbe 100644 (file)
--- a/PWGGA/CaloTrackCorrelations/macros/ana.C
+++ b/PWGGA/CaloTrackCorrelations/macros/ana.C
@@ -231,7 +231,7 @@ void ana(Int_t mode=mGRID)
   Bool_t kPrint   = kFALSE;
   Bool_t deltaAOD = kFALSE;
   gROOT->LoadMacro("AddTaskCaloTrackCorr.C");   // $ALICE_ROOT/PWGGA/CaloTrackCorrelations/macros
-  gROOT->LoadMacro("AddTaskEMCALClusterize.C"); // $ALICE_ROOT/PWGGA/EMCALTasks/macros  
+  gROOT->LoadMacro("$ALICE_ROOT/PWGGA/EMCALTasks/AddTaskEMCALClusterize.C"); // $ALICE_ROOT/PWGGA/EMCALTasks/macros  
   
   
   // ------
@@ -429,11 +429,11 @@ void  LoadLibraries(Int_t mode)
   
   gSystem->Load("libPHOSUtils");
   gSystem->Load("libEMCALUtils");
-  gSystem->Load("libPWGCaloTrackBase");
-  gSystem->Load("libPWGGACaloCorrelations");
+  gSystem->Load("libPWGCaloTrackCorrBase");
+  gSystem->Load("libPWGGACaloTrackCorrelations");
   gSystem->Load("libPWGGAEMCALTasks");
-  //SetupPar("PWGCaloTrackBase");
-  //SetupPar("PWGGACaloCorrelations");
+  //SetupPar("PWGCaloTrackCorrBase");
+  //SetupPar("PWGGACaloTrackCorrelations");
   //SetupPar("PWGGAEMCALTasks");
   
   //gSystem->Load("libJETAN");