fix coding rules violations and bug fix

[u/mrichter/AliRoot.git] / PWG0 / dNdPt / AlidNdPtCutAnalysis.cxx

diff --git a/PWG0/dNdPt/AlidNdPtCutAnalysis.cxx b/PWG0/dNdPt/AlidNdPtCutAnalysis.cxx
index ed9325f48e5c02359a921dc477bac7f9cf60419c..f93d27e7430914024c686f3259288fb6aa26baff 100644 (file)
--- a/PWG0/dNdPt/AlidNdPtCutAnalysis.cxx
+++ b/PWG0/dNdPt/AlidNdPtCutAnalysis.cxx
@@ -12,11 +12,19 @@
  * about the suitability of this software for any purpose. It is          *\r
  * provided "as is" without express or implied warranty.                  *\r
  **************************************************************************/\r
-\r
-#include <iostream>\r
-\r
-#include "TFile.h"\r
-#include "TCint.h"\r
+//------------------------------------------------------------------------------\r
+// AlidNdPtCutAnalysis class. \r
+//\r
+// a. functionality:\r
+// - fills generic cut histograms\r
+// - generates cuts (selection criteria)\r
+//\r
+// b. data members:\r
+// - generic cut histograms\r
+// - control histograms\r
+//\r
+// Author: J.Otwinowski 04/11/2008 \r
+//------------------------------------------------------------------------------\r
 #include "TH1.h"\r
 #include "TH2.h"\r
 \r
@@ -30,6 +38,7 @@
 \r
 #include "AlidNdPtEventCuts.h"\r
 #include "AlidNdPtAcceptanceCuts.h"\r
+#include "AliPhysicsSelection.h"\r
 \r
 #include "AliPWG0Helper.h"\r
 #include "AlidNdPtHelper.h"\r
@@ -98,9 +107,11 @@ void AlidNdPtCutAnalysis::Init(){
   fEventCount->Sumw2();\r
 \r
   //Xv:Yv:Zv:ResZv:Mult\r
+  Double_t kFact = 0.1;\r
+\r
   Int_t binsRecEventHist[5]={80,80,100,80,150};\r
-  Double_t minRecEventHist[5]={-3.,-3.,-35.,0.,0.}; \r
-  Double_t maxRecEventHist[5]={3.,3.,35.,10.,150.}; \r
+  Double_t minRecEventHist[5]={-3.*kFact,-3.*kFact,-35.,0.,0.}; \r
+  Double_t maxRecEventHist[5]={3.*kFact,3.*kFact,35.,10.,150.}; \r
   fRecEventHist = new THnSparseF("fRecEventHist","Xv:Yv:Zv:ResZv:Mult",5,binsRecEventHist,minRecEventHist,maxRecEventHist);\r
   fRecEventHist->GetAxis(0)->SetTitle("Xv (cm)");\r
   fRecEventHist->GetAxis(1)->SetTitle("Yv (cm)");\r
@@ -121,8 +132,8 @@ void AlidNdPtCutAnalysis::Init(){
 \r
   //Xv-mcXv:Yv-mcYv:Zv-mcZv:Mult\r
   Int_t binsRecMCEventHist[4]={100,100,100,150};\r
-  Double_t minRecMCEventHist[4]={-10.0,-10.0,-10.0,0.}; \r
-  Double_t maxRecMCEventHist[4]={10.0,10.0,10.0,150.}; \r
+  Double_t minRecMCEventHist[4]={-10.0*kFact,-10.0*kFact,-10.0*kFact,0.}; \r
+  Double_t maxRecMCEventHist[4]={10.0*kFact,10.0*kFact,10.0*kFact,150.}; \r
   fRecMCEventHist = new THnSparseF("fRecMCEventHist","mcXv-Xv:mcYv-Yv:mcZv-Zv:Mult",4,binsRecMCEventHist,minRecMCEventHist,maxRecMCEventHist);\r
   fRecMCEventHist->GetAxis(0)->SetTitle("mcXv-Xv (cm)");\r
   fRecMCEventHist->GetAxis(1)->SetTitle("mcYv-Yv (cm)");\r
@@ -134,12 +145,12 @@ void AlidNdPtCutAnalysis::Init(){
   // THnSparse track histograms\r
   //\r
 \r
-  //nClust:chi2PerClust:nClust/nFindableClust:DCAy:DCAz:eta:phi:pt:isKink:isPrim\r
-  Int_t binsRecMCTrackHist[10]={160,80,80,80,80,30,90,ptNbins, 2,2};\r
-  Double_t minRecMCTrackHist[10]={0., 0., 0., -10.,-10.,-1.5, 0., ptMin, 0., 0.};\r
-  Double_t maxRecMCTrackHist[10]={160.,10.,1.2, 10.,10.,1.5, 2.*TMath::Pi(), ptMax, 2.,2.};\r
+  //nClust:chi2PerClust:nClust/nFindableClust:DCAy:DCAz:eta:phi:pt:isKink:isPrim:polarity\r
+  Int_t binsRecMCTrackHist[11]={160,80,80,80,80,30,90,ptNbins, 2, 2, 2};\r
+  Double_t minRecMCTrackHist[11]={0., 0., 0., -10.,-10.,-1.5, 0., ptMin, 0., 0., 0.};\r
+  Double_t maxRecMCTrackHist[11]={160.,10.,1.2, 10.,10.,1.5, 2.*TMath::Pi(), ptMax, 2.,2., 2.};\r
 \r
-  fRecMCTrackHist = new THnSparseF("fRecMCTrackHist","nClust:chi2PerClust:nClust/nFindableClust:DCAy:DCAz:eta:phi:pt:isKink:isPrim",10,binsRecMCTrackHist,minRecMCTrackHist,maxRecMCTrackHist);\r
+  fRecMCTrackHist = new THnSparseF("fRecMCTrackHist","nClust:chi2PerClust:nClust/nFindableClust:DCAy:DCAz:eta:phi:pt:isKink:isPrim:polarity",11,binsRecMCTrackHist,minRecMCTrackHist,maxRecMCTrackHist);\r
   fRecMCTrackHist->SetBinEdges(7,binsPt);\r
 \r
   fRecMCTrackHist->GetAxis(0)->SetTitle("nClust");\r
@@ -152,6 +163,7 @@ void AlidNdPtCutAnalysis::Init(){
   fRecMCTrackHist->GetAxis(7)->SetTitle("p_{T} (GeV/c)");\r
   fRecMCTrackHist->GetAxis(8)->SetTitle("isKink");\r
   fRecMCTrackHist->GetAxis(9)->SetTitle("isPrim");\r
+  fRecMCTrackHist->GetAxis(10)->SetTitle("polarity");\r
   fRecMCTrackHist->Sumw2();\r
 \r
   // init output folder\r
@@ -180,15 +192,25 @@ void AlidNdPtCutAnalysis::Process(AliESDEvent *const esdEvent, AliMCEvent * cons
     return;\r
   }\r
 \r
+  // get physics trigger selection \r
+  AliPhysicsSelection *trigSel = GetPhysicsTriggerSelection();\r
+  if(!trigSel) {\r
+    AliDebug(AliLog::kError, "cannot get trigSel");\r
+    return;\r
+  }\r
+\r
   // trigger selection\r
   Bool_t isEventTriggered = kTRUE;\r
   if(evtCuts->IsTriggerRequired())  {\r
     if(IsUseMCInfo()) { \r
-      static AliTriggerAnalysis* triggerAnalysis = new AliTriggerAnalysis;\r
-      isEventTriggered = triggerAnalysis->IsTriggerFired(esdEvent, GetTrigger());\r
+      //static AliTriggerAnalysis* triggerAnalysis = new AliTriggerAnalysis;\r
+      //isEventTriggered = triggerAnalysis->IsTriggerFired(esdEvent, GetTrigger());\r
+      trigSel->SetAnalyzeMC();\r
+      isEventTriggered = trigSel->IsCollisionCandidate(esdEvent);\r
     }\r
     else {\r
-      isEventTriggered = esdEvent->IsTriggerClassFired(GetTriggerClass());\r
+      //isEventTriggered = esdEvent->IsTriggerClassFired(GetTriggerClass());\r
+      isEventTriggered = trigSel->IsCollisionCandidate(esdEvent);\r
     }\r
   }\r
 \r
@@ -273,6 +295,17 @@ void AlidNdPtCutAnalysis::Process(AliESDEvent *const esdEvent, AliMCEvent * cons
       AliESDtrack *track = (AliESDtrack*)allChargedTracks->At(i);\r
       if(!track) continue;\r
 \r
+      //\r
+      if (GetAnalysisMode()==AlidNdPtHelper::kTPCSPDvtxUpdate) \r
+      {\r
+        //\r
+        // update track parameters\r
+       //\r
+           AliExternalTrackParam cParam;\r
+          track->RelateToVertexTPC(esdEvent->GetPrimaryVertexSPD(),esdEvent->GetMagneticField(),kVeryBig,&cParam);\r
+          track->Set(cParam.GetX(),cParam.GetAlpha(),cParam.GetParameter(),cParam.GetCovariance());\r
+      }\r
+\r
       FillHistograms(track, stack);\r
       multAll++;\r
     }\r
@@ -291,7 +324,7 @@ void AlidNdPtCutAnalysis::Process(AliESDEvent *const esdEvent, AliMCEvent * cons
 }\r
 \r
 //_____________________________________________________________________________\r
-void AlidNdPtCutAnalysis::FillHistograms(AliESDtrack *const esdTrack, AliStack *const stack)\r
+void AlidNdPtCutAnalysis::FillHistograms(AliESDtrack *const esdTrack, AliStack *const stack) const\r
 {\r
   //\r
   // Fill ESD track and MC histograms \r
@@ -334,12 +367,15 @@ void AlidNdPtCutAnalysis::FillHistograms(AliESDtrack *const esdTrack, AliStack *
   }\r
 \r
   // fill histo\r
-  Double_t vRecMCTrackHist[10] = {nClust,chi2PerCluster,clustPerFindClust,b[0],b[1],eta,phi,pt,isKink,isPrim}; \r
+  Int_t polarity = -2;\r
+  if (esdTrack->Charge() < 0.) polarity = 0; \r
+  else polarity = 1; \r
+  Double_t vRecMCTrackHist[11] = { nClust,chi2PerCluster,clustPerFindClust,b[0],b[1],eta,phi,pt,isKink,isPrim, polarity }; \r
   fRecMCTrackHist->Fill(vRecMCTrackHist);\r
 }\r
 \r
 //_____________________________________________________________________________\r
-Long64_t AlidNdPtCutAnalysis::Merge(TCollection* list) \r
+Long64_t AlidNdPtCutAnalysis::Merge(TCollection* const list) \r
 {\r
   // Merge list of objects (needed by PROOF)\r
 \r
@@ -613,7 +649,7 @@ void AlidNdPtCutAnalysis::Analyse()
 }\r
 \r
 //_____________________________________________________________________________\r
-TFolder* AlidNdPtCutAnalysis::ExportToFolder(TObjArray * array) \r
+TFolder* AlidNdPtCutAnalysis::ExportToFolder(TObjArray * const array) \r
 {\r
   // recreate folder avery time and export objects to new one\r
   //\r