Summary and trend extraction for TPC with modified AliPerformanceTPC

[u/mrichter/AliRoot.git] / PWG1 / TPC / AliPerformanceDEdx.cxx

diff --git a/PWG1/TPC/AliPerformanceDEdx.cxx b/PWG1/TPC/AliPerformanceDEdx.cxx
index 687eb393b3deaf0d0453f94b334ac0242907e83e..31787134ef2098299574dc7325898f344de87eac 100644 (file)
--- a/PWG1/TPC/AliPerformanceDEdx.cxx
+++ b/PWG1/TPC/AliPerformanceDEdx.cxx
@@ -27,8 +27,9 @@
 
   // user can save whole comparison object (or only folder with anlysed histograms) 
   // in the seperate output file (e.g.)
-  TFile fout("Analysed_DEdx.root"."recreate");
-  compObj->Write(); // compObj->GetAnalysisFolder()->Write();
+  TFile fout("Analysed_DEdx.root","recreate");
+  //compObj->Write(); // compObj->GetAnalysisFolder()->Write();
+  compObj->GetAnalysisFolder()->Write();
   fout.Close();
 
 */
@@ -42,6 +43,7 @@
 
 #include "AliPerformanceDEdx.h" 
 #include "AliESDEvent.h"
+#include "AliTracker.h"
 #include "AliMCEvent.h"
 #include "AliESDtrack.h"
 #include "AliStack.h"
@@ -176,10 +178,32 @@ void AliPerformanceDEdx::ProcessTPC(AliStack* const /*stack*/, AliESDtrack *cons
 }
 
 //_____________________________________________________________________________
-void AliPerformanceDEdx::ProcessInnerTPC(AliStack* const stack, AliESDtrack *const esdTrack)
+void AliPerformanceDEdx::ProcessInnerTPC(AliStack* const stack, AliESDtrack *const esdTrack, AliESDEvent* const esdEvent)
 {
+ //
+ // Fill TPC track information at inner TPC wall
+ // 
+  if(!esdEvent) return;
   if(!esdTrack) return;
 
+  if( IsUseTrackVertex() ) 
+  { 
+    // Relate TPC inner params to prim. vertex
+    const AliESDVertex *vtxESD = esdEvent->GetPrimaryVertexTracks();
+    Double_t x[3]; esdTrack->GetXYZ(x);
+    Double_t b[3]; AliTracker::GetBxByBz(x,b);
+    Bool_t isOK = esdTrack->RelateToVertexTPCBxByBz(vtxESD, b, kVeryBig);
+    if(!isOK) return;
+
+    /*
+      // JMT -- recaluclate DCA for HLT if not present
+      if ( dca[0] == 0. && dca[1] == 0. ) {
+        track->GetDZ( vtxESD->GetX(), vtxESD->GetY(), vtxESD->GetZ(), esdEvent->GetMagneticField(), dca );
+      }
+    */
+  }
+
+  // get external param. at inner TPC wall
   const AliExternalTrackParam *innerParam =  esdTrack->GetInnerParam();
   if(!innerParam) return;
 
@@ -324,8 +348,17 @@ void AliPerformanceDEdx::Exec(AliMCEvent* const mcEvent, AliESDEvent *const esdE
     if(!isEventTriggered) return; 
   }
 
-  // get TPC event vertex
-  const AliESDVertex *vtxESD = esdEvent->GetPrimaryVertexTPC();
+  // get event vertex
+  const AliESDVertex *vtxESD = NULL;
+  if( IsUseTrackVertex() ) 
+  { 
+    // track vertex
+    vtxESD = esdEvent->GetPrimaryVertexTracks();
+  }
+  else {
+    // TPC track vertex
+    vtxESD = esdEvent->GetPrimaryVertexTPC();
+  }
   if(vtxESD && (vtxESD->GetStatus()<=0)) return;
 
   //  Process events
@@ -337,7 +370,7 @@ void AliPerformanceDEdx::Exec(AliMCEvent* const mcEvent, AliESDEvent *const esdE
     if(GetAnalysisMode() == 0) ProcessTPC(stack,track);
     else if(GetAnalysisMode() == 1) ProcessTPCITS(stack,track);
     else if(GetAnalysisMode() == 2) ProcessConstrained(stack,track);
-    else if(GetAnalysisMode() == 3) ProcessInnerTPC(stack,track);
+    else if(GetAnalysisMode() == 3) ProcessInnerTPC(stack,track,esdEvent);
     else {
       printf("ERROR: AnalysisMode %d \n",fAnalysisMode);
       return;