code cleaning and addition Michael Knichel and Jacek Otwinowski

diff --git a/PWG0/dNdPt/AlidNdPtAcceptanceCuts.cxx b/PWG0/dNdPt/AlidNdPtAcceptanceCuts.cxx
index 7482430aa494c101b19b030c531a466f33ae9118..087bf83849c662426408a3ecdbde94bcce079217 100644 (file)
--- a/PWG0/dNdPt/AlidNdPtAcceptanceCuts.cxx
+++ b/PWG0/dNdPt/AlidNdPtAcceptanceCuts.cxx
@@ -85,6 +85,19 @@ Bool_t AlidNdPtAcceptanceCuts::AcceptTrack(AliESDtrack *track)
   if(pt < fMinPt) return kFALSE;
   if(pt > fMaxPt) return kFALSE;
   
+return kTRUE;
+}
+
+Bool_t AlidNdPtAcceptanceCuts::AcceptTrackLocalTPC(AliESDtrack *track)
+{
+  // check acceptance cuts for AliESDtrack
+  if(!track) return kFALSE;
+  const AliExternalTrackParam *innerParam =  track->GetInnerParam();
+  if(!innerParam) return kFALSE;
+
+  Float_t eta = track->Eta();
+  Float_t phi = TMath::ATan2(innerParam->Py(),innerParam->Px());
+
   if (fCheckRange) {
       if ((eta > fExcludeMinEta) && (eta < fExcludeMaxEta) && (phi > fExcludeMinPhi) && (phi < fExcludeMaxPhi)) { return kFALSE; }
   }

diff --git a/PWG0/dNdPt/AlidNdPtAcceptanceCuts.h b/PWG0/dNdPt/AlidNdPtAcceptanceCuts.h
index 34910fb7021a63c1de3c96ddf81992ed56edb871..4d248e67e283990d75da3f67c02c0303e1050491 100644 (file)
--- a/PWG0/dNdPt/AlidNdPtAcceptanceCuts.h
+++ b/PWG0/dNdPt/AlidNdPtAcceptanceCuts.h
@@ -56,6 +56,7 @@ public:
 \r
   //\r
   Bool_t AcceptTrack(AliESDtrack *track);\r
+  Bool_t AcceptTrackLocalTPC(AliESDtrack *track);\r
   Bool_t AcceptTrack(AliExternalTrackParam *track);\r
   Bool_t AcceptTrack(TParticle *particle);\r
   \r

diff --git a/PWG0/dNdPt/AlidNdPtAnalysis.cxx b/PWG0/dNdPt/AlidNdPtAnalysis.cxx
index 169244fea5fc13445588796dec81597deb5d76d6..99f198b50ba6edfc4fdd2048dbdeb561db8ef608 100644 (file)
--- a/PWG0/dNdPt/AlidNdPtAnalysis.cxx
+++ b/PWG0/dNdPt/AlidNdPtAnalysis.cxx
@@ -141,6 +141,7 @@ ClassImp(AlidNdPtAnalysis)
   // Generic histograms to be corrected\r
   fRecEventHist(0),\r
   fRecTrackHist(0),\r
+  fEventCount(0),\r
 \r
   // Candle event histogram\r
   fRecCandleEventMatrix(0),\r
@@ -254,6 +255,7 @@ AlidNdPtAnalysis::AlidNdPtAnalysis(Char_t* name, Char_t* title): AlidNdPt(name,t
   // Generic histograms to be corrected\r
   fRecEventHist(0),\r
   fRecTrackHist(0),\r
+  fEventCount(0),\r
 \r
   // Candle event histogram\r
   fRecCandleEventMatrix(0),\r
@@ -368,6 +370,7 @@ AlidNdPtAnalysis::~AlidNdPtAnalysis() {
   //\r
   if(fRecEventHist) delete fRecEventHist; fRecEventHist=0; \r
   if(fRecTrackHist) delete fRecTrackHist; fRecTrackHist=0; \r
+  if(fEventCount) delete fEventCount; fEventCount=0;\r
 \r
   //\r
   if(fAnalysisFolder) delete fAnalysisFolder; fAnalysisFolder=0;\r
@@ -993,6 +996,15 @@ void AlidNdPtAnalysis::Init(){
   fRecTrackHist2->GetAxis(3)->SetTitle("#eta");\r
   fRecTrackHist2->GetAxis(4)->SetTitle("#phi (rad)");\r
   fRecTrackHist2->Sumw2();\r
+  \r
+  Int_t binsEventCount[3]={2,2,2};\r
+  Double_t minEventCount[3]={0,0,0}; \r
+  Double_t maxEventCount[3]={2,2,2}; \r
+  fEventCount = new THnSparseF("fEventCount","trig vs trig+vertex",3,binsEventCount,minEventCount,maxEventCount);\r
+  fEventCount->GetAxis(0)->SetTitle("trig");\r
+  fEventCount->GetAxis(1)->SetTitle("trig+vert");\r
+  fEventCount->GetAxis(2)->SetTitle("selected");\r
+  fEventCount->Sumw2();\r
 \r
   // init folder\r
   fAnalysisFolder = CreateFolder("folderdNdPt","Analysis dNdPt Folder");\r
@@ -1047,7 +1059,7 @@ void AlidNdPtAnalysis::Process(AliESDEvent *const esdEvent, AliMCEvent *const mc
     if(!physicsSelection) return;\r
     //SetPhysicsTriggerSelection(physicsSelection);\r
 \r
-    if (isEventTriggered) {\r
+    if (isEventTriggered && (GetTrigger() == AliTriggerAnalysis::kV0AND)) {\r
       // set trigger (V0AND)\r
       triggerAnalysis = physicsSelection->GetTriggerAnalysis();\r
       if(!triggerAnalysis) return;\r
@@ -1074,131 +1086,6 @@ void AlidNdPtAnalysis::Process(AliESDEvent *const esdEvent, AliMCEvent *const mc
   }\r
 \r
 \r
-  /*\r
-  if(evtCuts->IsTriggerRequired())  \r
-  {\r
-    //\r
-    trigSel = GetPhysicsTriggerSelection();\r
-    if(!trigSel) {\r
-      AliDebug(AliLog::kError, "cannot get trigSel");\r
-      return;\r
-    }\r
-    \r
-    if(IsUseMCInfo()) \r
-    { \r
-      trigSel->SetAnalyzeMC();\r
-\r
-      if(GetParticleMode() == AlidNdPtHelper::kVZEROCase1)\r
-      {\r
-        // check V0 systematics (case1)\r
-       // Initialization done in the macro\r
-        trigAna = trigSel->GetTriggerAnalysis();\r
-        if(!trigAna) \r
-          return;\r
-\r
-        //trigAna->SetV0HwPars(15, 61.5, 86.5);\r
-        //trigAna->SetV0AdcThr(15);\r
-\r
-        isEventTriggered = trigSel->IsCollisionCandidate(esdEvent);\r
-        //printf("MB1 & kVZEROCase1  %d \n",isEventTriggered);\r
-        //isEventTriggered = trigAna->IsOfflineTriggerFired(esdEvent, GetTrigger());\r
-       \r
-        if(GetTrigger() == AliTriggerAnalysis::kV0AND) \r
-       {\r
-          isEventTriggered = trigAna->IsOfflineTriggerFired(esdEvent, GetTrigger());\r
-          //printf("V0AND %d \n",isEventTriggered);\r
-        }\r
-      }\r
-      else if(GetParticleMode() == AlidNdPtHelper::kVZEROCase2)\r
-      {\r
-        // check V0 systematics (case2 only in MC)\r
-       // Initialization done in the macro\r
-\r
-        trigAna = trigSel->GetTriggerAnalysis();\r
-        if(!trigAna) \r
-          return;\r
-\r
-        //trigAna->SetV0HwPars(0, 0, 125);\r
-        //trigAna->SetV0AdcThr(0);\r
-\r
-        isEventTriggered = trigSel->IsCollisionCandidate(esdEvent);\r
-        //isEventTriggered = trigAna->IsOfflineTriggerFired(esdEvent, GetTrigger());\r
-       \r
-       if(GetTrigger() == AliTriggerAnalysis::kV0AND) \r
-       {\r
-          isEventTriggered = trigAna->IsOfflineTriggerFired(esdEvent, GetTrigger());\r
-          //printf("V0AND %d \n",isEventTriggered);\r
-        }\r
-      }\r
-      else {\r
-        isEventTriggered = trigSel->IsCollisionCandidate(esdEvent);\r
-        //printf("MB1 %d \n",isEventTriggered);\r
-       \r
-        if(GetTrigger() == AliTriggerAnalysis::kV0AND) \r
-       {\r
-          trigAna = trigSel->GetTriggerAnalysis();\r
-          if(!trigAna) \r
-            return;\r
-\r
-          isEventTriggered = trigAna->IsOfflineTriggerFired(esdEvent, GetTrigger());\r
-          //printf("V0AND %d \n",isEventTriggered);\r
-        }\r
-      }\r
-    }\r
-    else {\r
-      //\r
-      // 0-multiplicity bin for LHC background correction\r
-      //\r
-      if( GetAnalysisMode() == AlidNdPtHelper::kTPCITS || \r
-          GetAnalysisMode() == AlidNdPtHelper::kTPCTrackSPDvtx || \r
-         GetAnalysisMode() == AlidNdPtHelper::kTPCTrackSPDvtxUpdate || \r
-          GetAnalysisMode() == AlidNdPtHelper::kTPCITSHybridTrackSPDvtx || \r
-         GetAnalysisMode() == AlidNdPtHelper::kTPCITSHybridTrackSPDvtxDCArPt ) \r
-      {\r
-        trigSel->SetBin0CallbackViaPointer(&AlidNdPtAnalysis::IsBinZeroTrackSPDvtx);\r
-      } else {\r
-        trigSel->SetBin0CallbackViaPointer(&AlidNdPtAnalysis::IsBinZeroSPDvtx);\r
-      }\r
-\r
-      if(GetParticleMode() == AlidNdPtHelper::kVZEROCase1)\r
-      {\r
-        // check V0 systematics (case1)\r
-       // Initialization done in the macro\r
-        trigAna = trigSel->GetTriggerAnalysis();\r
-        if(!trigAna) \r
-          return;\r
-\r
-        //trigAna->SetV0HwPars(15, 61.5, 86.5);\r
-        //trigAna->SetV0AdcThr(15);\r
-\r
-        isEventTriggered = trigSel->IsCollisionCandidate(esdEvent);\r
-        //isEventTriggered = trigAna->IsOfflineTriggerFired(esdEvent, GetTrigger());\r
-       \r
-        if(GetTrigger() == AliTriggerAnalysis::kV0AND) \r
-       {\r
-          isEventTriggered = trigAna->IsOfflineTriggerFired(esdEvent, GetTrigger());\r
-          //printf("V0AND %d \n",isEventTriggered);\r
-        }\r
-      }\r
-      else {\r
-        isEventTriggered = trigSel->IsCollisionCandidate(esdEvent);\r
-        //printf("MB1 %d \n",isEventTriggered);\r
-       \r
-        if(GetTrigger() == AliTriggerAnalysis::kV0AND) \r
-       {\r
-          trigAna = trigSel->GetTriggerAnalysis();\r
-          if(!trigAna) \r
-            return;\r
-\r
-          isEventTriggered = trigAna->IsOfflineTriggerFired(esdEvent, GetTrigger());\r
-          //printf("V0AND %d \n",isEventTriggered);\r
-        }\r
-      }\r
-    }\r
-  }\r
-  */\r
-\r
-\r
   // use MC information\r
   AliHeader* header = 0;\r
   AliGenEventHeader* genHeader = 0;\r
@@ -1267,6 +1154,11 @@ void AlidNdPtAnalysis::Process(AliESDEvent *const esdEvent, AliMCEvent *const mc
   Bool_t isEventOK = evtCuts->AcceptEvent(esdEvent,mcEvent,vtxESD) && isRecVertex; \r
   //printf("isEventOK %d, isEventTriggered %d \n",isEventOK, isEventTriggered);\r
   //printf("GetAnalysisMode() %d \n",GetAnalysisMode());\r
+  \r
+  Bool_t isTrigAndVertex = isEventTriggered && isEventOK;\r
+  \r
+  Double_t vEventCount[3] = { (isEventTriggered && kTRUE) , isTrigAndVertex,  isTrigAndVertex && (TMath::Abs(vtxESD->GetZv()) < 10.)};\r
+  fEventCount->Fill(vEventCount);  \r
 \r
   // vertex contributors\r
   Int_t multMBTracks = 0; \r
@@ -1315,10 +1207,6 @@ void AlidNdPtAnalysis::Process(AliESDEvent *const esdEvent, AliMCEvent *const mc
   Int_t multAll=0, multAcc=0, multRec=0;\r
   Int_t *labelsAll=0, *labelsAcc=0, *labelsRec=0;\r
 \r
-  // cosmics analysis\r
-  Int_t cosmicCount = 0;\r
-  // high-pt tracks\r
-  Int_t highPtCount = 0;\r
 \r
   // check event cuts\r
   if(isEventOK && isEventTriggered && isEventSelected)\r
@@ -1354,7 +1242,6 @@ void AlidNdPtAnalysis::Process(AliESDEvent *const esdEvent, AliMCEvent *const mc
       }  \r
     }\r
 \r
-    \r
 \r
     labelsAll = new Int_t[entries];\r
     labelsAcc = new Int_t[entries];\r
@@ -1373,6 +1260,15 @@ void AlidNdPtAnalysis::Process(AliESDEvent *const esdEvent, AliMCEvent *const mc
       if(GetParticleMode() == AlidNdPtHelper::kMinus && track->Charge() > 0) \r
         continue;\r
 \r
+      FillHistograms(track,stack,vtxESD->GetZv(),AlidNdPtHelper::kAllTracks, multRecTemp); \r
+      labelsAll[multAll] = TMath::Abs(track->GetLabel());\r
+      multAll++;\r
+     \r
+      //if(accCuts->AcceptTrack(track)) { \r
+      //FillHistograms(track,stack,AlidNdPtHelper::kAccTracks); \r
+      //labelsAcc[multAcc] = TMath::Abs(track->GetLabel());\r
+      //multAcc++;\r
+      //}\r
 \r
       // esd track selection \r
       // ITS stand alone\r
@@ -1427,6 +1323,7 @@ void AlidNdPtAnalysis::Process(AliESDEvent *const esdEvent, AliMCEvent *const mc
       }\r
       else {\r
         // check track cuts\r
+    \r
         if(!esdTrackCuts->AcceptTrack(track)) \r
          continue;\r
       }\r
@@ -1456,43 +1353,6 @@ void AlidNdPtAnalysis::Process(AliESDEvent *const esdEvent, AliMCEvent *const mc
         if(tpcTrack) delete tpcTrack; \r
       } \r
 \r
-      FillHistograms(track,stack,vtxESD->GetZv(),AlidNdPtHelper::kAllTracks, multRecTemp); \r
-      labelsAll[multAll] = TMath::Abs(track->GetLabel());\r
-      multAll++;\r
-\r
-         //FillHistograms(track,stack,AlidNdPtHelper::kAccTracks); \r
-        //labelsAcc[multAcc] = TMath::Abs(track->GetLabel());\r
-        //multAcc++;\r
-      \r
-         // check high-pt tracks\r
-         if(accCuts->AcceptTrack(track) && track->Pt() > 6.)\r
-        {\r
-            //printf(" high pt: pt %f \n",track->Pt());\r
-            highPtCount++;\r
-        }\r
-\r
-         // check cosmics tracks\r
-         if( GetParticleMode()==AlidNdPtHelper::kCosmic )\r
-         {\r
-           if(accCuts->AcceptTrack(track)) \r
-          { \r
-             for(Int_t j=0; j<entries;++j) \r
-             {\r
-               AliESDtrack *track1 = (AliESDtrack*)allChargedTracks->At(j);\r
-               if(!track1) continue;\r
-               if(track1->Charge()==0) continue;\r
-\r
-               if( esdTrackCuts->AcceptTrack(track1) && accCuts->AcceptTrack(track1) ) \r
-               { \r
-                if ( AlidNdPtHelper::IsCosmicTrack(track,track1) ) { \r
-                  cosmicCount++;\r
-                  break;\r
-                }\r
-              }\r
-            }\r
-          }\r
-          // if(!isCosmic) continue;\r
-         }\r
 \r
          // update track parameters using vertex point \r
         if( GetAnalysisMode() == AlidNdPtHelper::kTPCSPDvtxUpdate || \r
@@ -1519,14 +1379,7 @@ void AlidNdPtAnalysis::Process(AliESDEvent *const esdEvent, AliMCEvent *const mc
             }\r
           }\r
      }\r
-    // if(cosmicCount) \r
-       //printf("COSMIC EVENT: number %d , mult %d \n", esdEvent->GetEventNumberInFile(), multRec);\r
 \r
-    // if(highPtCount) \r
-       //printf("HIGH PT EVENT: number %d , mult %d \n", esdEvent->GetEventNumberInFile(), multRec);\r
-\r
-    // if(multRec > 30) \r
-       //printf("HIGH MULT EVENT: number %d , mult %d \n", esdEvent->GetEventNumberInFile(), multRec);\r
 \r
      // fill track multiplicity histograms\r
      FillHistograms(allChargedTracks,labelsAll,multAll,labelsAcc,multAcc,labelsRec,multRec);\r
@@ -1714,9 +1567,9 @@ void AlidNdPtAnalysis::Process(AliESDEvent *const esdEvent, AliMCEvent *const mc
          Double_t vTrackMatrix[3] = {vtxMC[2],particle->Pt(),particle->Eta()}; \r
 \r
         // all genertated primaries including neutral\r
-         if( iMc < stack->GetNprimary() ) {\r
-           //fGenTrackMatrix->Fill(vTrackMatrix);\r
-        }\r
+         //if( iMc < stack->GetNprimary() ) {\r
+         //fGenTrackMatrix->Fill(vTrackMatrix);\r
+        //}\r
 \r
          // only charged particles\r
          if(!particle->GetPDG()) continue;\r
@@ -2103,6 +1956,7 @@ Long64_t AlidNdPtAnalysis::Merge(TCollection* const list)
     fRecMCTrackHist1->Add(entry->fRecMCTrackHist1);\r
     fMCMultRecTrackHist1->Add(entry->fMCMultRecTrackHist1);\r
     fRecTrackHist2->Add(entry->fRecTrackHist2);\r
+    fEventCount->Add(entry->fEventCount);\r
 \r
   count++;\r
   }\r

diff --git a/PWG0/dNdPt/AlidNdPtAnalysis.h b/PWG0/dNdPt/AlidNdPtAnalysis.h
index 684c443a90f7a003105cd8fba2a22f6378c471c3..108d5a3bdad5503d67d20520e67f087f02151e30 100644 (file)
--- a/PWG0/dNdPt/AlidNdPtAnalysis.h
+++ b/PWG0/dNdPt/AlidNdPtAnalysis.h
@@ -152,7 +152,7 @@ public :
   THnSparseF *GetMCMultRecTrackHist1() const {return fMCMultRecTrackHist1;}
 
   THnSparseF *GetRecTrackHist2() const {return fRecTrackHist2;}
-
+  THnSparseF *GetEventCount() const {return fEventCount;}  
 
   //
   // Generic histograms to be corrected
@@ -276,8 +276,9 @@ private:
   //
   // Generic histograms to be corrected
   //
-  THnSparseF *fRecEventHist; //-> Zv:multMB
+  THnSparseF *fRecEventHist;    //-> Zv:multMB  
   THnSparseF *fRecTrackHist; //-> Zv:pT:eta:multRec
+  THnSparseF *fEventCount; //-> trig, trig + vertex, selected event
 
   //
   // candle events track corrections
@@ -301,7 +302,7 @@ private:
   AlidNdPtAnalysis(const AlidNdPtAnalysis&); // not implemented
   AlidNdPtAnalysis& operator=(const AlidNdPtAnalysis&); // not implemented
 
-  ClassDef(AlidNdPtAnalysis,5);
+  ClassDef(AlidNdPtAnalysis,6);
 };
 
 #endif

diff --git a/PWG0/dNdPt/AlidNdPtAnalysisPbPb.cxx b/PWG0/dNdPt/AlidNdPtAnalysisPbPb.cxx
index 85de4da65fc629e5401a2d51c5d44b3f909bf9ca..2dcad4254e0ef0415ba694368f26e18a5e843f2d 100644 (file)
--- a/PWG0/dNdPt/AlidNdPtAnalysisPbPb.cxx
+++ b/PWG0/dNdPt/AlidNdPtAnalysisPbPb.cxx
@@ -788,7 +788,7 @@ void AlidNdPtAnalysisPbPb::Process(AliESDEvent *const esdEvent, AliMCEvent *cons
     if(!physicsSelection) return;
     //SetPhysicsTriggerSelection(physicsSelection);
 
-    if (isEventTriggered) {
+    if (isEventTriggered && (GetTrigger() == AliTriggerAnalysis::kV0AND)) {
       // set trigger (V0AND)
       triggerAnalysis = physicsSelection->GetTriggerAnalysis();
       if(!triggerAnalysis) return;
@@ -796,49 +796,11 @@ void AlidNdPtAnalysisPbPb::Process(AliESDEvent *const esdEvent, AliMCEvent *cons
     }
   }
 
-  /*
-  // trigger selection
-  Bool_t isEventTriggered = kTRUE;
-  AliPhysicsSelection *trigSel = NULL;
-  AliTriggerAnalysis *trigAna = NULL;
-
-  if(evtCuts->IsTriggerRequired())  
-  {
-    //
-    trigSel = GetPhysicsTriggerSelection();
-    if(!trigSel) {
-      printf("cannot get trigSel \n");
-      return;
-    }
-
-    //
-    if(IsUseMCInfo()) 
-    { 
-      trigSel->SetAnalyzeMC();
-
-      
-        isEventTriggered = trigSel->IsCollisionCandidate(esdEvent);
-       
-        if(GetTrigger() == AliTriggerAnalysis::kV0AND) 
-       {
-          trigAna = trigSel->GetTriggerAnalysis();
-          if(!trigAna) 
-            return;
-
-          isEventTriggered = trigAna->IsOfflineTriggerFired(esdEvent, GetTrigger());
-        }//if(GetTrigger() == AliTriggerAnalysis::kV0AND)
-     }//if(IsUseMCInfo())
-  }//if(evtCuts->IsTriggerRequired())
-  */
 
   // centrality determination
-  Float_t centralityF = 0;
+  Float_t centralityF = -1.;
   AliCentrality *esdCentrality = esdEvent->GetCentrality();
   centralityF = esdCentrality->GetCentralityPercentile(fCentralityEstimator.Data()); 
-  if (centralityF == 0.) {
-    centralityF = 100.;
-  }
-
 
   // use MC information
   AliHeader* header = 0;
@@ -905,17 +867,12 @@ void AlidNdPtAnalysisPbPb::Process(AliESDEvent *const esdEvent, AliMCEvent *cons
 
   // vertex contributors
   Int_t multMBTracks = 0; 
-  if(GetAnalysisMode() == AlidNdPtHelper::kTPC) 
+  if(GetAnalysisMode() == AlidNdPtHelper::kTPC || GetAnalysisMode() == AlidNdPtHelper::kTPCITS) 
   {
      if(vtxESD->GetStatus()) {
          multMBTracks = vtxESD->GetNContributors();
      }
   } 
-  else if(GetAnalysisMode() == AlidNdPtHelper::kTPCITS) {
-     if(vtxESD->GetStatus()) {
-         multMBTracks = vtxESD->GetNContributors();
-     }
-  }
   else {
     AliDebug(AliLog::kError, Form("Found analysis type %d", GetAnalysisMode()));
     return; 
@@ -963,7 +920,7 @@ void AlidNdPtAnalysisPbPb::Process(AliESDEvent *const esdEvent, AliMCEvent *cons
       labelsAll[multAll] = TMath::Abs(track->GetLabel());
 
       multAll++;      
-      if(esdTrackCuts->AcceptTrack(track) && accCuts->AcceptTrack(track) && recCuts->AcceptTrack(track)) {
+      if(esdTrackCuts->AcceptTrack(track) && accCuts->AcceptTrack(track) && recCuts->AcceptTrackLocalTPC(track)) {
 
          fRecTrackHist2[AlidNdPtHelper::kRecTracks]->Fill(values);
          FillHistograms(track,stack,AlidNdPtHelper::kRecTracks,centralityF); 
@@ -988,9 +945,6 @@ void AlidNdPtAnalysisPbPb::Process(AliESDEvent *const esdEvent, AliMCEvent *cons
 
    if(IsUseMCInfo())  
    {
-
-     //Double_t vMultTrueEventMatrix[2] = { multRec, multMCTrueTracks };
-
      // 
      // event level corrections (zv,N_MB)
      //
@@ -1147,8 +1101,6 @@ void AlidNdPtAnalysisPbPb::Process(AliESDEvent *const esdEvent, AliMCEvent *cons
   if(labelsAcc) delete [] labelsAcc; labelsAcc = 0;
   if(labelsRec) delete [] labelsRec; labelsRec = 0;
 
-  if(!evtCuts->IsRecVertexRequired() && vtxESD != NULL) delete vtxESD;
-
 }
 
 //_____________________________________________________________________________

diff --git a/PWG0/dNdPt/AlidNdPtEventCuts.cxx b/PWG0/dNdPt/AlidNdPtEventCuts.cxx
index 353c4e5831a032f14efd8895248746fef56a08cb..63047bad26d80f76b7a616e400a37142f0b17d05 100644 (file)
--- a/PWG0/dNdPt/AlidNdPtEventCuts.cxx
+++ b/PWG0/dNdPt/AlidNdPtEventCuts.cxx
@@ -110,13 +110,6 @@ Bool_t AlidNdPtEventCuts::AcceptEvent(AliESDEvent *esdEvent,AliMCEvent *mcEvent,
       retValue=kFALSE;
   }
 
-  /*
-  Float_t R = TMath::Sqrt(vtx->GetXv()*vtx->GetXv()+vtx->GetYv()*vtx->GetYv());
-  if(vtx->GetNContributors() < fMinNContributors) return kFALSE; 
-  if(vtx->GetNContributors() > fMaxNContributors) return kFALSE; 
-  if(R > fMaxR) return kFALSE; 
-  */
-
   if(vtx->GetZv() < fMinZv) return kFALSE; 
   if(vtx->GetZv() > fMaxZv) return kFALSE; 
 

diff --git a/PWG0/dNdPt/AlidNdPtHelper.cxx b/PWG0/dNdPt/AlidNdPtHelper.cxx
index 8829854ace201b0d172a460bc09fb27d6c840162..71cc3f58b5b00f8f1d88944ae9453115deff7317 100644 (file)
--- a/PWG0/dNdPt/AlidNdPtHelper.cxx
+++ b/PWG0/dNdPt/AlidNdPtHelper.cxx
@@ -70,14 +70,14 @@ const AliESDVertex* AlidNdPtHelper::GetVertex(AliESDEvent* const aEsd, const Ali
 
   const AliESDVertex* vertex = 0;
   AliESDVertex *initVertex = 0;
-  if (analysisMode == kSPD || analysisMode == kTPCITS || 
+  if (analysisMode == kSPD || 
       analysisMode == kTPCSPDvtx || analysisMode == kTPCSPDvtxUpdate || analysisMode == kTPCITSHybrid)
   {
     vertex = aEsd->GetPrimaryVertexSPD();
     if (debug)
       Printf("AlidNdPtHelper::GetVertex: Returning SPD vertex");
-  }
-  else if (analysisMode == kTPCTrackSPDvtx || analysisMode == kTPCTrackSPDvtxUpdate || 
+  }  
+  else if (analysisMode == kTPCITS  || analysisMode == kTPCTrackSPDvtx || analysisMode == kTPCTrackSPDvtxUpdate || 
            analysisMode == kTPCITSHybridTrackSPDvtx || analysisMode == kTPCITSHybridTrackSPDvtxDCArPt || 
           analysisMode == kITSStandAloneTrackSPDvtx ||  analysisMode == kITSStandAloneTPCTrackSPDvtx)
   {
@@ -211,17 +211,6 @@ Bool_t AlidNdPtHelper::TestRecVertex(const AliESDVertex* vertex, const AliESDVer
     }
   }
 
-  /*
-  // check Ncontributors
-  if (vertex->GetNContributors() <= 0) {
-    if (debug){
-      Printf("AlidNdPtHelper::GetVertex: NContributors() <= 0: %d",vertex->GetNContributors());
-      Printf("AlidNdPtHelper::GetVertex: NIndices(): %d",vertex->GetNIndices());
-      vertex->Print();
-    }
-    return kFALSE;
-  }
-  */
 
   return kTRUE;
 }

diff --git a/PWG0/dNdPt/AlidNdPtTask.cxx b/PWG0/dNdPt/AlidNdPtTask.cxx
index 4ff2fb90e40416717804da90e433e5934c4d70fc..33a023b7c67049f0d5f2e5e93f3d0952a9f1331a 100644 (file)
--- a/PWG0/dNdPt/AlidNdPtTask.cxx
+++ b/PWG0/dNdPt/AlidNdPtTask.cxx
@@ -55,8 +55,6 @@ AlidNdPtTask::AlidNdPtTask(const char *name)
   , fPitList(0)\r
   , fCompList(0)\r
   , fUseMCInfo(kFALSE)\r
-  , fUseCentrality(0)    // default = off\r
-  , fUseCentralityBin(0)\r
 {\r
   // Constructor\r
 \r
@@ -140,10 +138,6 @@ void AlidNdPtTask::UserCreateOutputObjects()
   }\r
   Printf("UserCreateOutputObjects(): Number of output objects: %d \n", count);\r
 \r
-  if(fUseCentrality) {\r
-    Printf("Use Centrality - Bin %d", fUseCentralityBin);\r
-  }\r
-\r
   PostData(1, fOutput);\r
 }\r
 \r
@@ -170,23 +164,12 @@ void AlidNdPtTask::UserExec(Option_t *)
     }\r
   }\r
 \r
-  // Process analysis\r
-  Bool_t process = kTRUE;\r
-\r
-  // Check fo centrality\r
-  if (fUseCentrality) {\r
-    if ( CalculateCentralityBin() != fUseCentralityBin ) {\r
-      process = kFALSE;\r
-    }\r
-  }\r
 \r
-  if (process) {\r
     AlidNdPt *pObj = 0;\r
     fPitList->Reset();\r
     while((pObj = (AlidNdPt *)fPitList->Next()) != NULL) {\r
       pObj->Process(fESD,fMC);\r
     }\r
-  }\r
 \r
 \r
   // Post output data.\r
@@ -205,40 +188,3 @@ void AlidNdPtTask::Terminate(Option_t *)
     return;\r
   }\r
 }\r
-\r
-//________________________________________________________________________\r
-Int_t AlidNdPtTask::CalculateCentralityBin(){\r
-  // Get Centrality bin\r
-\r
-  Int_t centrality = -1;\r
-  Float_t centralityF = -1;\r
-\r
-  if (fUseCentrality == 0)\r
-    return centrality;\r
-\r
-  AliCentrality *esdCentrality = fESD->GetCentrality();\r
-    \r
-  // New : 2010-11-18 JMT \r
-  if ( fUseCentrality == 1 )\r
-    centralityF = esdCentrality->GetCentralityPercentile("V0M");\r
-  else if ( fUseCentrality == 2 )\r
-    centralityF = esdCentrality->GetCentralityPercentile("CL1");\r
-  else if ( fUseCentrality == 3 )\r
-    centralityF = esdCentrality->GetCentralityPercentile("TRK"); \r
-  if (centralityF == 0.)\r
-    centralityF = 100.;\r
-\r
-  if      ( centralityF >=  0. && centralityF <   5.) centrality =  0;\r
-  else if ( centralityF >=  5. && centralityF <  10.) centrality =  5;\r
-  else if ( centralityF >= 10. && centralityF <  20.) centrality = 10;\r
-  else if ( centralityF >= 20. && centralityF <  30.) centrality = 20;\r
-  else if ( centralityF >= 30. && centralityF <  40.) centrality = 30;\r
-  else if ( centralityF >= 40. && centralityF <  50.) centrality = 40;\r
-  else if ( centralityF >= 50. && centralityF <  60.) centrality = 50;\r
-  else if ( centralityF >= 60. && centralityF <  70.) centrality = 60;\r
-  else if ( centralityF >= 70. && centralityF <  80.) centrality = 70;\r
-  else if ( centralityF >= 80. && centralityF <  90.) centrality = 80;\r
-  else if ( centralityF >= 90. && centralityF <=100.) centrality = 90;\r
-  \r
-  return centrality;\r
-}\r

diff --git a/PWG0/dNdPt/AlidNdPtTask.h b/PWG0/dNdPt/AlidNdPtTask.h
index 2354383cde531fbb30e6ec33e9e07e5216a651e6..46b1c1130e4e76486a487306dbcea2c4a92e8d48 100644 (file)
--- a/PWG0/dNdPt/AlidNdPtTask.h
+++ b/PWG0/dNdPt/AlidNdPtTask.h
@@ -33,20 +33,9 @@ class AlidNdPtTask : public AliAnalysisTaskSE {
 
   Bool_t AddAnalysisObject(AlidNdPt *pObj);
   void SetUseMCInfo(Bool_t info)           { fUseMCInfo = info; }
-
-  // Use centrality - if yes, which one
-  void  SetUseCentrality(Int_t cent)   { fUseCentrality = cent; }
-  Int_t GetUseCentrality()             { return fUseCentrality; }
-
-  // Centrality bin to be used
-  void  SetUseCentralityBin(Int_t bin) { fUseCentralityBin = bin; }
-  Int_t GetUseCentralityBin()          { return fUseCentralityBin; }
   
  private:
 
-  // Calculate centrality
-  Int_t CalculateCentralityBin();
-
   AliESDEvent *fESD;    //! ESD event
   AliMCEvent *fMC;      //! MC event
   TList* fOutput;       //! list send on output slot 0
@@ -55,13 +44,10 @@ class AlidNdPtTask : public AliAnalysisTaskSE {
 
   Bool_t fUseMCInfo;        // use MC information
 
-  Int_t fUseCentrality;     // use centrality (0=off(default),1=VZERO,2=SPD)
-  Int_t fUseCentralityBin;  // centrality bin to be used 
-
   AlidNdPtTask(const AlidNdPtTask&); // not implemented
   AlidNdPtTask& operator=(const AlidNdPtTask&); // not implemented
   
-  ClassDef(AlidNdPtTask, 2); // example of analysis
+  ClassDef(AlidNdPtTask, 3); // example of analysis
 };
 
 #endif