addtask updates from naghmeh

diff --git a/PWGCF/FLOW/macros/AddTaskPIDFlowQC.C b/PWGCF/FLOW/macros/AddTaskPIDFlowQC.C
index 2a9230581c074ed7150acaa711b650a71fd7bde2..f2a47fc82ccc5c9eb666af4b7c8907c0f95abbc4 100644 (file)
--- a/PWGCF/FLOW/macros/AddTaskPIDFlowQC.C
+++ b/PWGCF/FLOW/macros/AddTaskPIDFlowQC.C
@@ -69,8 +69,8 @@ for(int icentr=0;icentr<ncentr;icentr++){
     
     // RP TRACK CUTS:
     cutsRP[icentr] = new AliFlowTrackCuts(Form("TPConlyRP_%d",icentr));
-    cutsRP[icentr]->SetParamType(rptype);
-    cutsRP[icentr]->SetParamMix(rpmix);
+   // cutsRP[icentr]->SetParamType(rptype);
+   // cutsRP[icentr]->SetParamMix(rpmix);
     cutsRP[icentr]->SetPtRange(0.2,5.);
     cutsRP[icentr]->SetEtaRange(etamin,etamax);
     cutsRP[icentr]->SetMinNClustersTPC(70);
@@ -84,40 +84,40 @@ for(int icentr=0;icentr<ncentr;icentr++){
     cutsRP[icentr]->SetQA(doQA);
 
     
-    //POIs for SP and QC method
+    //POIs for QC method
     //===========================================================================
-    AliFlowTrackCuts  *SP_POI[ncentr];
+    AliFlowTrackCuts  *QC_POI[ncentr];
     //half window for POIs
-    //=======================SP POI Cuts
-    SP_POI[icentr] = DefinePOIcuts(icentr);
-
-    SP_POI[icentr]->GetBayesianResponse()->ForceOldDedx(); // for 2010 data to use old TPC PID Response instead of the official one
-    SP_POI[icentr]->SetParamType(poitype);
-    SP_POI[icentr]->SetParamMix(poimix);
-    SP_POI[icentr]->SetPtRange(0.2,5.);//
-    SP_POI[icentr]->SetMinNClustersTPC(70);
-    SP_POI[icentr]->SetEtaRange( etamin,etamax );
+    //=======================QC POI Cuts
+    QC_POI[icentr] = DefinePOIcuts(icentr);
+
+    QC_POI[icentr]->GetBayesianResponse()->ForceOldDedx(); // for 2010 data to use old TPC PID Response instead of the official one
+   // QC_POI[icentr]->SetParamType(poitype);
+   // QC_POI[icentr]->SetParamMix(poimix);
+    QC_POI[icentr]->SetPtRange(0.2,5.);//
+    QC_POI[icentr]->SetMinNClustersTPC(70);
+    QC_POI[icentr]->SetEtaRange( etamin,etamax );
   
-    // SP_POI->SetMinChi2PerClusterTPC(0.1); //
-    // SP_POI->SetMaxChi2PerClusterTPC(4.0); //
-    //  SP_POI->SetRequireITSRefit(kTRUE);
-    //  SP_POI->SetRequireTPCRefit(kTRUE);
-    //  SP_POI->SetMinNClustersITS(2);
-    //  SP_POI->SetMaxChi2PerClusterITS(1.e+09);
-    SP_POI[icentr]->SetMaxDCAToVertexXY(3.0);
-    SP_POI[icentr]->SetMaxDCAToVertexZ(3.0);
-    //SP_POI->SetDCAToVertex2D(kTRUE);
-    //SP_POI->SetMaxNsigmaToVertex(1.e+10);
-    //SP_POI->SetRequireSigmaToVertex(kFALSE);
-    SP_POI[icentr]->SetAcceptKinkDaughters(kFALSE);
-    if(isPID) SP_POI[icentr]->SetPID(particleType, sourcePID);//particleType, sourcePID
-    if (charge!=0) SP_POI[icentr]->SetCharge(charge);
-    //SP_POI->SetAllowTOFmismatch(kFALSE);
-    SP_POI[icentr]->SetRequireStrictTOFTPCagreement(kTRUE);
-    SP_POI[icentr]->SetMinimalTPCdedx(MinTPCdedx);
-    SP_POI[icentr]->SetAODfilterBit(AODfilterBitPOI);
-    SP_POI[icentr]->SetQA(doQA);
-    SP_POI[icentr]->SetPriors((centrMin[icentr]+centrMax[icentr])*0.5);
+    // QC_POI[icentr]->SetMinChi2PerClusterTPC(0.1); //
+    // QC_POI[icentr]->SetMaxChi2PerClusterTPC(4.0); //
+    //  QC_POI[icentr]->SetRequireITSRefit(kTRUE);
+    //  QC_POI[icentr]->SetRequireTPCRefit(kTRUE);
+    //  QC_POI[icentr]->SetMinNClustersITS(2);
+    //  QC_POI[icentr]->SetMaxChi2PerClusterITS(1.e+09);
+    QC_POI[icentr]->SetMaxDCAToVertexXY(3.0);
+    QC_POI[icentr]->SetMaxDCAToVertexZ(3.0);
+    //QC_POI[icentr]->SetDCAToVertex2D(kTRUE);
+    //QC_POI[icentr]->SetMaxNsigmaToVertex(1.e+10);
+    //QC_POI[icentr]->SetRequireSigmaToVertex(kFALSE);
+    QC_POI[icentr]->SetAcceptKinkDaughters(kFALSE);
+    if(isPID) QC_POI[icentr]->SetPID(particleType, sourcePID);//particleType, sourcePID
+    if (charge!=0) QC_POI[icentr]->SetCharge(charge);
+    //QC_POI[icentr]->SetAllowTOFmismatch(kFALSE);
+    QC_POI[icentr]->SetRequireStrictTOFTPCagreement(kTRUE);
+    QC_POI[icentr]->SetMinimalTPCdedx(MinTPCdedx);
+    QC_POI[icentr]->SetAODfilterBit(AODfilterBitPOI);
+    QC_POI[icentr]->SetQA(doQA);
+    QC_POI[icentr]->SetPriors((centrMin[icentr]+centrMax[icentr])*0.5);
 
 
 
@@ -146,7 +146,7 @@ for(int icentr=0;icentr<ncentr;icentr++){
         outputSlotName[icentr][harmonic-2]+=Form("_v%i_",harmonic);
         outputSlotName[icentr][harmonic-2]+=cutsRP[icentr]->GetName();
         outputSlotName[icentr][harmonic-2]+="_";
-        outputSlotName[icentr][harmonic-2]+=SP_POI[icentr]->GetName();
+        outputSlotName[icentr][harmonic-2]+=QC_POI[icentr]->GetName();
         outputSlotName[icentr][harmonic-2]+=Form("_%i-",centrMin[icentr]);
         outputSlotName[icentr][harmonic-2]+=Form("%i_",centrMax[icentr]);
         
@@ -207,7 +207,7 @@ for (int icentr=0; icentr<ncentr; icentr++) {
     // Pass cuts for RPs and POIs to the task:
     taskFE[icentr]->SetCutsEvent(cutsEvent[icentr]);
     taskFE[icentr]->SetCutsRP(cutsRP[icentr]);
-    taskFE[icentr]->SetCutsPOI(SP_POI[icentr]);
+    taskFE[icentr]->SetCutsPOI(QC_POI[icentr]);
     if (cutsRP[icentr]->GetParamType()==AliFlowTrackCuts::kVZERO)
     {
         //TODO: since this is set in a static object all analyses in an analysis train

diff --git a/PWGCF/FLOW/macros/AddTaskPIDFlowSP.C b/PWGCF/FLOW/macros/AddTaskPIDFlowSP.C
index f1c0c8e114c4689cf29f009ea8aac3fe0128fef6..4026271af874c40bbc6393cdffdcf79990107e10 100644 (file)
--- a/PWGCF/FLOW/macros/AddTaskPIDFlowSP.C
+++ b/PWGCF/FLOW/macros/AddTaskPIDFlowSP.C
@@ -1,5 +1,3 @@
-//AddTask macro for higher harmonic flow analysis with SP method only.
-
 class AliAnalysisDataContainer;
 class AliFlowTrackCuts;
 class AliFlowEventCuts;
@@ -80,7 +78,7 @@ for(int icentr=0;icentr<ncentr;icentr++){
     cutsRP[icentr] = new AliFlowTrackCuts(Form("RP_%d",icentr));
     if(!VZERO){
         //cutsRP[icentr]->SetParamType(rptype);
-        cutsRP[icentr]->SetParamMix(rpmix);
+   //     cutsRP[icentr]->SetParamMix(rpmix);
         cutsRP[icentr]->SetPtRange(0.2,5.);
         cutsRP[icentr]->SetEtaRange(etamin,etamax);
         cutsRP[icentr]->SetMinNClustersTPC(70);
@@ -110,8 +108,8 @@ for(int icentr=0;icentr<ncentr;icentr++){
     SP_POI[icentr] = DefinePOIcuts(icentr);
 
     SP_POI[icentr]->GetBayesianResponse()->ForceOldDedx(); // for 2010 data to use old TPC PID Response instead of the official one
-    SP_POI[icentr]->SetParamType(poitype);
-    SP_POI[icentr]->SetParamMix(poimix);
+    //SP_POI[icentr]->SetParamType(poitype);
+    //SP_POI[icentr]->SetParamMix(poimix);
     SP_POI[icentr]->SetPtRange(0.2,5.);//
     SP_POI[icentr]->SetMinNClustersTPC(70);
     if(!VZERO && Qvector=="Qa"){
@@ -131,7 +129,7 @@ for(int icentr=0;icentr<ncentr;icentr++){
     // SP_POI->SetMinChi2PerClusterTPC(0.1); //
     // SP_POI->SetMaxChi2PerClusterTPC(4.0); //
     //  SP_POI->SetRequireITSRefit(kTRUE);
-    //  SP_POI->SetRequireTPCRefit(kTRUE);
+    //  SP_POI->SetRequireTPCRefit(\13kTRUE);
     //  SP_POI->SetMinNClustersITS(2);
     //  SP_POI->SetMaxChi2PerClusterITS(1.e+09);
     SP_POI[icentr]->SetMaxDCAToVertexXY(3.0);
@@ -270,6 +268,7 @@ for (int icentr=0; icentr<ncentr; icentr++) {
         
 
     for(int harm=2;harm<6;harm++){
+ //   for(int harm=2;harm<3;harm++){
         myNameSP[icentr][harm-2] = "SP_";
         myNameSP[icentr][harm-2] += Qvector;
         myNameSP[icentr][harm-2] += Form("_v%i_%s_%.f",harm,outputSlotName[icentr][harm-2].Data(),EtaGap*10);
@@ -306,6 +305,7 @@ for (int icentr=0; icentr<ncentr; icentr++) {
                                          TList::Class(),AliAnalysisManager::kOutputContainer,outputSP);
         mgr->AddTask(taskSP[icentr][harm-2]);
         mgr->ConnectInput(taskSP[icentr][harm-2],0,flowEvent[icentr][harm-2]);
+    //    mgr->ConnectInput(taskSP[icentr][harm-2],0,coutputFE[icentr]);
         mgr->ConnectOutput(taskSP[icentr][harm-2],1,coutputSP[icentr][harm-2]);
     }