updated macros with some current settings

diff --git a/PWG2/FLOW/macros/AddTaskFlowCentrality.C b/PWG2/FLOW/macros/AddTaskFlowCentrality.C
index e2fb3d4dc1cb4909da038cdef43aa8f71dd6c994..8caa23d39851a3732583e9c5b2e67019bf87a27f 100644 (file)
--- a/PWG2/FLOW/macros/AddTaskFlowCentrality.C
+++ b/PWG2/FLOW/macros/AddTaskFlowCentrality.C
@@ -40,11 +40,11 @@ Bool_t GFC      = kTRUE;  // cumulants based on generating function
 Bool_t QC       = kTRUE;  // cumulants using Q vectors
 Bool_t FQD      = kTRUE;  // fit of the distribution of the Q vector (only integrated v)
 Bool_t LYZ1SUM  = kTRUE;  // Lee Yang Zeroes using sum generating function (integrated v)
-Bool_t LYZ1PROD = kTRUE;  // Lee Yang Zeroes using product generating function (integrated v)
+Bool_t LYZ1PROD = kFALSE;  // Lee Yang Zeroes using product generating function (integrated v)
 Bool_t LYZ2SUM  = kFALSE; // Lee Yang Zeroes using sum generating function (second pass differential v)
 Bool_t LYZ2PROD = kFALSE; // Lee Yang Zeroes using product generating function (second pass differential v)
 Bool_t LYZEP    = kFALSE; // Lee Yang Zeroes Event plane using sum generating function (gives eventplane + weight)
-Bool_t MH       = kTRUE;  // azimuthal correlators in mixed harmonics  
+Bool_t MH       = kFALSE;  // azimuthal correlators in mixed harmonics  
 Bool_t NL       = kFALSE;  // nested loops (for instance distribution of phi1-phi2 for all distinct pairs)
 
 Bool_t METHODS[] = {SP,LYZ1SUM,LYZ1PROD,LYZ2SUM,LYZ2PROD,LYZEP,GFC,QC,FQD,MCEP,MH,NL};
@@ -88,40 +88,40 @@ void AddTaskFlowCentrality( Int_t refMultMin=0,
   cutsRP->SetParamType(rptype);
   cutsRP->SetParamMix(rpmix);
   cutsRP->SetPtRange(0.2,10.);
-  cutsRP->SetEtaRange(-0.7,0.7);
+  cutsRP->SetEtaRange(-0.8,0.8);
   cutsRP->SetRequireCharge(kTRUE);
   //cutsRP->SetCharge(chargeRP);
   //cutsRP->SetPID(PdgRP);
-  cutsRP->SetMinNClustersTPC(80);
-  cutsRP->SetMaxChi2PerClusterTPC(4.0);
-  cutsRP->SetMinNClustersITS(2);
+  //cutsRP->SetMinNClustersTPC(80);
+  //cutsRP->SetMaxChi2PerClusterTPC(4.0);
+  //cutsRP->SetMinNClustersITS(2);
   //cutsRP->SetMaxChi2PerClusterITS(1.e+09);
   cutsRP->SetMaxDCAToVertexXY(2.4);
   cutsRP->SetMaxDCAToVertexZ(3.2);
-  cutsRP->SetDCAToVertex2D(kFALSE);
-  cutsRP->SetMaxNsigmaToVertex(1.e+10);
-  cutsRP->SetRequireSigmaToVertex(kFALSE);
-  cutsRP->SetAcceptKinkDaughters(kFALSE);
+  //cutsRP->SetDCAToVertex2D(kTRUE);
+  //cutsRP->SetMaxNsigmaToVertex(1.e+10);
+  //cutsRP->SetRequireSigmaToVertex(kFALSE);
+  //cutsRP->SetAcceptKinkDaughters(kFALSE);
 
   // POI TRACK CUTS:
   AliFlowTrackCuts* cutsPOI = new AliFlowTrackCuts();
   cutsPOI->SetParamType(poitype);
   cutsPOI->SetParamMix(poimix);
-  cutsPOI->SetPtRange(0.2,10.);
-  cutsPOI->SetEtaRange(-0.7,0.7);
+  cutsPOI->SetPtRange(0.1,100.);
+  cutsPOI->SetEtaRange(-1.2,1.2);
   cutsPOI->SetRequireCharge(kTRUE);
   //cutsPOI->SetCharge(chargeRP);
   //cutsPOI->SetPID(PdgRP);
-  cutsPOI->SetMinNClustersTPC(80);
-  cutsPOI->SetMaxChi2PerClusterTPC(4.0);
-  cutsPOI->SetMinNClustersITS(2);
+  //cutsPOI->SetMinNClustersTPC(80);
+  //cutsPOI->SetMaxChi2PerClusterTPC(4.0);
+  //cutsPOI->SetMinNClustersITS(2);
   //cutsPOI->SetMaxChi2PerClusterITS(1.e+09);
   cutsPOI->SetMaxDCAToVertexXY(2.4);
   cutsPOI->SetMaxDCAToVertexZ(3.2);
-  cutsPOI->SetDCAToVertex2D(kFALSE);
-  cutsPOI->SetMaxNsigmaToVertex(1.e+10);
-  cutsPOI->SetRequireSigmaToVertex(kFALSE);
-  cutsPOI->SetAcceptKinkDaughters(kFALSE);
+  //cutsPOI->SetDCAToVertex2D(kTRUE);
+  //cutsPOI->SetMaxNsigmaToVertex(1.e+10);
+  //cutsPOI->SetRequireSigmaToVertex(kFALSE);
+  //cutsPOI->SetAcceptKinkDaughters(kFALSE);
 
 
   Bool_t useWeights  = WEIGHTS[0] || WEIGHTS[1] || WEIGHTS[2];
@@ -298,7 +298,7 @@ void AddTaskFlowCentrality( Int_t refMultMin=0,
   if (SP){
     AliAnalysisTaskScalarProduct *taskSP = new AliAnalysisTaskScalarProduct("TaskScalarProduct",WEIGHTS[0]);
     taskSP->SetRelDiffMsub(1.0);
-    taskSP->SetApplyCorrectionForNUA(kFALSE);
+    taskSP->SetApplyCorrectionForNUA(kTRUE);
     mgr->AddTask(taskSP);
   }
   if (LYZ1SUM){
@@ -344,6 +344,7 @@ void AddTaskFlowCentrality( Int_t refMultMin=0,
     taskQC->SetnBinsMult(10000);
     taskQC->SetMinMult(0.);
     taskQC->SetMaxMult(10000.);
+    taskQC->SetApplyCorrectionForNUA(kTRUE);
     mgr->AddTask(taskQC);
   }
   if (FQD){

diff --git a/PWG2/FLOW/macros/runFlowTaskCentralityTrain.C b/PWG2/FLOW/macros/runFlowTaskCentralityTrain.C
index 7c206a83e276e7dd652d93476ba87ed390333666..e569747e53e37c17ef1690275bb18806162a60c4 100644 (file)
--- a/PWG2/FLOW/macros/runFlowTaskCentralityTrain.C
+++ b/PWG2/FLOW/macros/runFlowTaskCentralityTrain.C
@@ -9,16 +9,16 @@ enum anaModes {mLocal,mLocalPAR,mPROOF,mGrid,mGridPAR};
  
 // CENTRALITY DEFINITION
 const Int_t numberOfCentralityBins = 1;
-Int_t centralityArray[numberOfCentralityBins+1] = {0,1000000}; // in terms of reference multiplicity
+Int_t centralityArray[numberOfCentralityBins+1] = {10,8000}; // in terms of reference multiplicity
 TString commonOutputFileName = "outputCentrality"; // e.g.: result for centrality bin 0 will be in the file "outputCentrality0.root", etc
 
 //void runFlowTaskCentralityTrain(Int_t mode=mLocal, Int_t nRuns = 10, 
 //Bool_t DATA = kFALSE, const Char_t* dataDir="/Users/snelling/alice_data/Therminator_midcentral", Int_t offset = 0)
 
-void runFlowTaskCentralityTrain(Int_t mode = mPROOF, Int_t nRuns = 50000000, 
-                Bool_t DATA = kTRUE, const Char_t* dataDir="/alice/data/LHC10h_000137045_p1", Int_t offset=0) 
+//void runFlowTaskCentralityTrain(Int_t mode = mPROOF, Int_t nRuns = 50000000, 
+//Bool_t DATA = kTRUE, const Char_t* dataDir="/alice/data/LHC10h_000137045_p1", Int_t offset=0) 
 
-//void runFlowTaskCentralityTrain(Int_t mode = mGrid, Bool_t DATA = kTRUE)
+void runFlowTaskCentralityTrain(Int_t mode = mGrid, Bool_t DATA = kTRUE)
 {
   // Time:
   TStopwatch timer;
@@ -51,8 +51,8 @@ void runFlowTaskCentralityTrain(Int_t mode = mPROOF, Int_t nRuns = 50000000,
   // Event handlers:
   AliVEventHandler* esdH = new AliESDInputHandler;
   mgr->SetInputEventHandler(esdH);
-  AliMCEventHandler *mc = new AliMCEventHandler();
-  mgr->SetMCtruthEventHandler(mc); 
+  //  AliMCEventHandler *mc = new AliMCEventHandler();
+  //  mgr->SetMCtruthEventHandler(mc); 
   
   // Load the analysis task:
   gROOT->LoadMacro("AddTaskFlowCentrality.C");
@@ -84,6 +84,7 @@ void runFlowTaskCentralityTrain(Int_t mode = mPROOF, Int_t nRuns = 50000000,
   physicsSelTask->GetPhysicsSelection()->AddCollisionTriggerClass("+C0SM1-B-NOPF-ALL");
   physicsSelTask->GetPhysicsSelection()->AddCollisionTriggerClass("+C0VBA-B-NOPF-ALL");
   physicsSelTask->GetPhysicsSelection()->AddCollisionTriggerClass("+C0VBC-B-NOPF-ALL");
+  physicsSelTask->GetPhysicsSelection()->SetSkipV0(kTRUE);
 
   if(!DATA){physicsSelTask->GetPhysicsSelection()->SetAnalyzeMC();}
   // Enable debug printouts:
@@ -199,21 +200,21 @@ void LoadLibraries(const anaModes mode)
     gProof->ClearPackage("STEERBase.par");
     gProof->ClearPackage("ESD.par");
     gProof->ClearPackage("AOD.par");
-    */
-    gProof->ClearPackage("ANALYSIS.par");
-    gProof->ClearPackage("ANALYSISalice.par");
+    
+    //gProof->ClearPackage("ANALYSIS.par");
+    //gProof->ClearPackage("ANALYSISalice.par");
     gProof->ClearPackage("CORRFW.par");
     
     gProof->ClearPackage("PWG2flowCommon");
     gProof->ClearPackage("PWG2flowTasks");
-    
+    */
     // Upload the Packages
     //gProof->UploadPackage("STEERBase.par");
     //gProof->UploadPackage("ESD.par");    
     //gProof->UploadPackage("AOD.par");
        
-    gProof->UploadPackage("ANALYSIS.par"); 
-    gProof->UploadPackage("ANALYSISalice.par");
+    //gProof->UploadPackage("ANALYSIS.par"); 
+    //gProof->UploadPackage("ANALYSISalice.par");
     gProof->UploadPackage("CORRFW.par");
     gProof->UploadPackage("PWG2flowCommon.par");
     gProof->UploadPackage("PWG2flowTasks.par");
@@ -229,8 +230,8 @@ void LoadLibraries(const anaModes mode)
     //gProof->EnablePackage("AOD");
     
     // Always needed
-    gProof->EnablePackage("ANALYSIS");
-    gProof->EnablePackage("ANALYSISalice");
+    //gProof->EnablePackage("ANALYSIS");
+    //gProof->EnablePackage("ANALYSISalice");
     gProof->EnablePackage("CORRFW");
     gProof->EnablePackage("PWG2flowCommon");
     gProof->EnablePackage("PWG2flowTasks");