added new triggers

diff --git a/PWG2/FLOW/macros/AddTaskFlowCentrality.C b/PWG2/FLOW/macros/AddTaskFlowCentrality.C
index 8caa23d39851a3732583e9c5b2e67019bf87a27f..fd1fd0ff1835c58f8e68af8451ae4518aa006fc0 100644 (file)
--- a/PWG2/FLOW/macros/AddTaskFlowCentrality.C
+++ b/PWG2/FLOW/macros/AddTaskFlowCentrality.C
@@ -56,8 +56,8 @@ Bool_t WEIGHTS[] = {kFALSE,kFALSE,kFALSE}; //Phi, v'(pt), v'(eta)
 
 //---------Data selection----------
 //kMC, kGlobal, kESD_TPConly, kESD_SPDtracklet
-AliFlowTrackCuts::trackParameterType rptype = AliFlowTrackCuts::kGlobal;
-AliFlowTrackCuts::trackParameterType poitype = AliFlowTrackCuts::kGlobal;
+AliFlowTrackCuts::trackParameterType rptype = AliFlowTrackCuts::kESD_TPConly;
+AliFlowTrackCuts::trackParameterType poitype = AliFlowTrackCuts::kESD_TPConly;
 
 //---------Parameter mixing--------
 //kPure - no mixing, kTrackWithMCkine, kTrackWithMCPID, kTrackWithMCpt
@@ -80,8 +80,8 @@ void AddTaskFlowCentrality( Int_t refMultMin=0,
   // EVENTS CUTS:
   AliFlowEventCuts* cutsEvent = new AliFlowEventCuts();
   cutsEvent->SetRefMultRange(refMultMin,refMultMax);
-  //cutsEvent->SetRefMultMethod(AliFlowEventCuts::kTPConly);
-  cutsEvent->SetRefMultMethod(AliFlowEventCuts::kSPDtracklets);
+  cutsEvent->SetRefMultMethod(AliFlowEventCuts::kTPConly);
+  //cutsEvent->SetRefMultMethod(AliFlowEventCuts::kSPDtracklets);
   
   // RP TRACK CUTS:
   AliFlowTrackCuts* cutsRP = new AliFlowTrackCuts();
@@ -92,12 +92,12 @@ void AddTaskFlowCentrality( Int_t refMultMin=0,
   cutsRP->SetRequireCharge(kTRUE);
   //cutsRP->SetCharge(chargeRP);
   //cutsRP->SetPID(PdgRP);
-  //cutsRP->SetMinNClustersTPC(80);
-  //cutsRP->SetMaxChi2PerClusterTPC(4.0);
+  cutsRP->SetMinNClustersTPC(80);
+  cutsRP->SetMaxChi2PerClusterTPC(4.0);
   //cutsRP->SetMinNClustersITS(2);
   //cutsRP->SetMaxChi2PerClusterITS(1.e+09);
-  cutsRP->SetMaxDCAToVertexXY(2.4);
-  cutsRP->SetMaxDCAToVertexZ(3.2);
+  //cutsRP->SetMaxDCAToVertexXY(2.4);
+  //cutsRP->SetMaxDCAToVertexZ(3.2);
   //cutsRP->SetDCAToVertex2D(kTRUE);
   //cutsRP->SetMaxNsigmaToVertex(1.e+10);
   //cutsRP->SetRequireSigmaToVertex(kFALSE);
@@ -116,8 +116,8 @@ void AddTaskFlowCentrality( Int_t refMultMin=0,
   //cutsPOI->SetMaxChi2PerClusterTPC(4.0);
   //cutsPOI->SetMinNClustersITS(2);
   //cutsPOI->SetMaxChi2PerClusterITS(1.e+09);
-  cutsPOI->SetMaxDCAToVertexXY(2.4);
-  cutsPOI->SetMaxDCAToVertexZ(3.2);
+  //cutsPOI->SetMaxDCAToVertexXY(2.4);
+  //cutsPOI->SetMaxDCAToVertexZ(3.2);
   //cutsPOI->SetDCAToVertex2D(kTRUE);
   //cutsPOI->SetMaxNsigmaToVertex(1.e+10);
   //cutsPOI->SetRequireSigmaToVertex(kFALSE);

diff --git a/PWG2/FLOW/macros/runFlowTaskCentralityTrain.C b/PWG2/FLOW/macros/runFlowTaskCentralityTrain.C
index e569747e53e37c17ef1690275bb18806162a60c4..b7c806fa541ba4d1478c2e05ce0cf14a322d36f4 100644 (file)
--- a/PWG2/FLOW/macros/runFlowTaskCentralityTrain.C
+++ b/PWG2/FLOW/macros/runFlowTaskCentralityTrain.C
@@ -15,10 +15,10 @@ TString commonOutputFileName = "outputCentrality"; // e.g.: result for centralit
 //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_000137133_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;
@@ -80,11 +80,27 @@ void runFlowTaskCentralityTrain(Int_t mode = mGrid, Bool_t DATA = kTRUE)
     gROOT->LoadMacro("AddTaskPhysicsSelection.C"); 
   }
 
+  //  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);
+
   AliPhysicsSelectionTask* physicsSelTask = AddTaskPhysicsSelection();
-  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()->AddCollisionTriggerClass("+CMBAC-B-NOPF-ALL");
+   physicsSelTask->GetPhysicsSelection()->AddCollisionTriggerClass("+CMBS1C-B-NOPF-ALL");
+   physicsSelTask->GetPhysicsSelection()->AddCollisionTriggerClass("+CMBS1A-B-NOPF-ALL");
+// This are needed only to fill the statistics tables
+   physicsSelTask->GetPhysicsSelection()->AddBGTriggerClass("+CMBAC-C-NOPF-ALL");
+   physicsSelTask->GetPhysicsSelection()->AddBGTriggerClass("+CMBS1C-C-NOPF-ALL");
+   physicsSelTask->GetPhysicsSelection()->AddBGTriggerClass("+CMBS1A-C-NOPF-ALL");
+   physicsSelTask->GetPhysicsSelection()->AddBGTriggerClass("+CMBAC-A-NOPF-ALL");
+   physicsSelTask->GetPhysicsSelection()->AddBGTriggerClass("+CMBS1C-A-NOPF-ALL");
+   physicsSelTask->GetPhysicsSelection()->AddBGTriggerClass("+CMBS1A-A-NOPF-ALL");
+   physicsSelTask->GetPhysicsSelection()->AddBGTriggerClass("+CMBAC-E-NOPF-ALL");
+   physicsSelTask->GetPhysicsSelection()->AddBGTriggerClass("+CMBS1C-E-NOPF-ALL");
+   physicsSelTask->GetPhysicsSelection()->AddBGTriggerClass("+CMBS1A-E-NOPF-ALL");
+  }  
 
   if(!DATA){physicsSelTask->GetPhysicsSelection()->SetAnalyzeMC();}
   // Enable debug printouts: