update new settings of AliCaloPID

diff --git a/PWG4/macros/AddTaskPartCorr.C b/PWG4/macros/AddTaskPartCorr.C
index 419bdec9286607e5ba972a5caecf5332ffbf515f..935e9d3e0a82b44da0cd4e4eace0370ecd6a3068 100644 (file)
--- a/PWG4/macros/AddTaskPartCorr.C
+++ b/PWG4/macros/AddTaskPartCorr.C
@@ -378,12 +378,35 @@ AliAnaPhoton* ConfigurePhotonAnalysis()
   anaphoton->SwitchOnTrackMatchRejection() ;
   
   //PID cuts (shower shape)
-  
+  anaphoton->SwitchOnCaloPID(); // do PID selection, unless specified in GetCaloPID, selection not based on bayesian
   AliCaloPID* caloPID = anaphoton->GetCaloPID();
-  anaphoton->SwitchOnCaloPID(); // if nothing else specified bayesian
-  anaphoton->SwitchOnCaloPIDRecalculation(); // off, get bayesian weights, on use simple cut
-  caloPID->SetLambda0CutMax(0.30);
-  caloPID->SetLambda0CutMin(0.10);
+  //Not used in bayesian
+  
+  //EMCAL
+  caloPID->SetEMCALLambda0CutMax(0.30);
+  caloPID->SetEMCALLambda0CutMin(0.10);
+  
+  caloPID->SetEMCALDEtaCut(0.025);
+  caloPID->SetEMCALDPhiCut(0.05);
+  // In case of official AODs when dX and dZ was not stored, open the cuts 
+  // and rely on having a match recorded. In case of reclusterization, try.
+  if(kData=="AOD" && kClusterArray==""){
+    caloPID->SetEMCALDEtaCut(2000);  
+    caloPID->SetEMCALDPhiCut(2000); 
+  }
+  
+  //PHOS
+  caloPID->SetPHOSDispersionCut(2.5);
+  caloPID->SetPHOSRCut(2.);
+  if(kData=="AOD") caloPID->SetPHOSRCut(2000.); // Open cut since dX, dZ not stored
+  
+  if(kCalorimeter=="PHOS"){
+    caloPID->SetHistoDEtaRangeAndNBins(-200, 200, 200); // dZ
+    caloPID->SetHistoDPhiRangeAndNBins(-200, 200, 200); // dX
+  }
+  
+  //caloPID->SetTOFCut(10000000); // Not used, only to set PID bits
+  
   anaphoton->SwitchOffFillShowerShapeHistograms();  // Filled before photon shower shape selection
   
   // Input / output delta AOD settings
@@ -407,7 +430,7 @@ AliAnaPhoton* ConfigurePhotonAnalysis()
   if(kPrint) anaphoton->Print("");
   
   return anaphoton;
-  
+
 }
 
 //_______________________________________________

diff --git a/PWG4/macros/AddTaskPi0EMCALPbPb.C b/PWG4/macros/AddTaskPi0EMCALPbPb.C
index 536981ab6addd046653a8e3cfe7222d59ed1d194..2110dd28874ec0eb32955074033e62209a10227f 100644 (file)
--- a/PWG4/macros/AddTaskPi0EMCALPbPb.C
+++ b/PWG4/macros/AddTaskPi0EMCALPbPb.C
@@ -130,10 +130,10 @@ AliCaloTrackReader * ConfigureReader(TString kData,TString kInputDataType, TStri
   //------------------------
   
   //Min cluster/track E
-  reader->SetEMCALEMin(0.5); 
-  reader->SetEMCALEMax(1000); 
-  reader->SetPHOSEMin(0.3);
-  reader->SetPHOSEMax(1000);
+  reader->SetEMCALPtMin(0.5); 
+  reader->SetEMCALPtMax(1000); 
+  reader->SetPHOSPtMin(0.3);
+  reader->SetPHOSPtMax(1000);
   reader->SetCTSPtMin(0.1);
   reader->SetCTSPtMax(1000);
   
@@ -141,6 +141,7 @@ AliCaloTrackReader * ConfigureReader(TString kData,TString kInputDataType, TStri
   
   // Tracks
   reader->SwitchOffCTS();
+  
   //gROOT->LoadMacro("$ALICE_ROOT/PWG4/macros/CreateTrackCutsPWG4.C"); 
   //AliESDtrackCuts * esdTrackCuts = CreateTrackCutsPWG4(10011004); 
   //reader->SetTrackCuts(esdTrackCuts);
@@ -148,14 +149,14 @@ AliCaloTrackReader * ConfigureReader(TString kData,TString kInputDataType, TStri
   // Calorimeter
   
   reader->SetEMCALClusterListName(kClusterArray);
-  if(kClusterArray == "") {
-    //printf("**************** Normal analysis **************** \n");
-    reader->SwitchOnClusterRecalculation(); // Bad map removal
-  }
-  else {
-    printf("**************** Input for analysis is Clusterizer %s **************** \n", kClusterArray.Data());
-    reader->SwitchOffClusterRecalculation();
-  }  
+//  if(kClusterArray == "") {
+//    //printf("**************** Normal analysis **************** \n");
+//    reader->SwitchOnClusterRecalculation(); // Bad map removal
+//  }
+//  else {
+//    printf("**************** Input for analysis is Clusterizer %s **************** \n", kClusterArray.Data());
+//    reader->SwitchOffClusterRecalculation();
+//  }  
   
   if(kCalorimeter == "EMCAL") {
     reader->SwitchOnEMCALCells();  
@@ -237,9 +238,9 @@ AliCalorimeterUtils* ConfigureCaloUtils(Int_t kYears, TString kCollisions, TStri
     else             recou->SetNonLinearityFunction(AliEMCALRecoUtils::kPi0MC);
   }
   
-  recou->SwitchOnRejectExoticCell();
-  if(kClusterArray == "") recou->SwitchOnRejectExoticCluster();
-  else                    recou->SwitchOffRejectExoticCluster();
+  //recou->SwitchOnRejectExoticCell();
+  //if(kClusterArray == "") recou->SwitchOnRejectExoticCluster();
+  //else                    recou->SwitchOffRejectExoticCluster();
   
   if(kPrint) cu->Print("");
   
@@ -284,9 +285,9 @@ AliAnaPhoton* ConfigurePhotonAnalysis(TString kData, TString kCalorimeter, Int_t
   AliCaloPID* caloPID = anaphoton->GetCaloPID();
   anaphoton->SwitchOnCaloPID(); // if nothing else specified bayesian
   anaphoton->SwitchOnCaloPIDRecalculation(); // off, get bayesian weights, on use simple cut
-  caloPID->SetLambda0CutMax(0.30);
-  caloPID->SetLambda0CutMin(0.10);
-  anaphoton->SwitchOffFillShowerShapeHistograms();  // Filled before photon shower shape selection
+  //caloPID->SetLambda0CutMax(0.30);
+  //caloPID->SetLambda0CutMin(0.10);
+  //anaphoton->SwitchOffFillShowerShapeHistograms();  // Filled before photon shower shape selection
   
   // Input / output delta AOD settings
   
@@ -303,8 +304,8 @@ AliAnaPhoton* ConfigurePhotonAnalysis(TString kData, TString kCalorimeter, Int_t
   SetHistoRangeAndNBins(anaphoton, kCalorimeter, kYears, kCollisions, kSimulation); // see method below
   
   // Number of particle type MC histograms
-  anaphoton->FillNOriginHistograms(8);
-  anaphoton->FillNPrimaryHistograms(4);
+  //anaphoton->FillNOriginHistograms(8);
+  //anaphoton->FillNPrimaryHistograms(4);
   
   if(kPrint) anaphoton->Print("");
   
@@ -382,13 +383,13 @@ void SetHistoRangeAndNBins (AliAnaPartCorrBaseClass* ana, TString kCalorimeter,
   if(kCalorimeter=="EMCAL"){
     if(kYears==2010){
       ana->SetHistoPhiRangeAndNBins(78*TMath::DegToRad(), 122*TMath::DegToRad(), 78) ;
-      ana->SetHistoXRangeAndNBins(-230,90,120); // QA
-      ana->SetHistoYRangeAndNBins(370,450,40);  // QA
+      //ana->SetHistoXRangeAndNBins(-230,90,120); // QA
+      //ana->SetHistoYRangeAndNBins(370,450,40);  // QA
     }
     else {           
       ana->SetHistoPhiRangeAndNBins(78*TMath::DegToRad(), 182*TMath::DegToRad(), 108) ;
-      ana->SetHistoXRangeAndNBins(-600,90,200); // QA
-      ana->SetHistoYRangeAndNBins(100,450,100); // QA
+      //ana->SetHistoXRangeAndNBins(-600,90,200); // QA
+      //ana->SetHistoYRangeAndNBins(100,450,100); // QA
     }
     
     ana->SetHistoEtaRangeAndNBins(-0.72, 0.72, 144) ;
@@ -399,31 +400,31 @@ void SetHistoRangeAndNBins (AliAnaPartCorrBaseClass* ana, TString kCalorimeter,
     
   }
   
-  ana->SetHistoShowerShapeRangeAndNBins(0, 3, 300);
+  //ana->SetHistoShowerShapeRangeAndNBins(0, 3, 300);
   
   // Invariant mass analysis
   ana->SetHistoMassRangeAndNBins(0., 1., 200) ;
   ana->SetHistoAsymmetryRangeAndNBins(0., 1. , 100) ;
   
   // check if time calibration is on
-  ana->SetHistoTimeRangeAndNBins(-1000.,1000,1000);
-  ana->SetHistoDiffTimeRangeAndNBins(-200, 200, 800);
+  //ana->SetHistoTimeRangeAndNBins(-1000.,1000,1000);
+  //ana->SetHistoDiffTimeRangeAndNBins(-200, 200, 800);
   
   // QA, electron, charged
-  ana->SetHistoPOverERangeAndNBins(0,10.,100);
-  ana->SetHistodEdxRangeAndNBins(0.,200.,200);
+  //ana->SetHistoPOverERangeAndNBins(0,10.,100);
+  //ana->SetHistodEdxRangeAndNBins(0.,200.,200);
   
   // QA
-  ana->SetHistoFinePtRangeAndNBins(0, 10, 200) ; // bining for fhAmpId
-  ana->SetHistodRRangeAndNBins(0.,TMath::Pi(),150);
-  ana->SetHistoRatioRangeAndNBins(0.,2.,100);
-  ana->SetHistoVertexDistRangeAndNBins(0.,500.,500);
-  ana->SetHistoNClusterCellRangeAndNBins(0,500,500);
-  ana->SetHistoZRangeAndNBins(-400,400,200);
-  ana->SetHistoRRangeAndNBins(400,450,25);
-  ana->SetHistoV0SignalRangeAndNBins(0,5000,500);
-  ana->SetHistoV0MultiplicityRangeAndNBins(0,5000,500);
-  ana->SetHistoTrackMultiplicityRangeAndNBins(0,5000,500);
+  //ana->SetHistoFinePtRangeAndNBins(0, 10, 200) ; // bining for fhAmpId
+  //ana->SetHistodRRangeAndNBins(0.,TMath::Pi(),150);
+  //ana->SetHistoRatioRangeAndNBins(0.,2.,100);
+  //ana->SetHistoVertexDistRangeAndNBins(0.,500.,500);
+  //ana->SetHistoNClusterCellRangeAndNBins(0,500,500);
+  //ana->SetHistoZRangeAndNBins(-400,400,200);
+  //ana->SetHistoRRangeAndNBins(400,450,25);
+  //ana->SetHistoV0SignalRangeAndNBins(0,5000,500);
+  //ana->SetHistoV0MultiplicityRangeAndNBins(0,5000,500);
+  //ana->SetHistoTrackMultiplicityRangeAndNBins(0,5000,500);
   
 }