Test script updated

[u/mrichter/AliRoot.git] / TRD / AliTRDCalibTask.cxx

diff --git a/TRD/AliTRDCalibTask.cxx b/TRD/AliTRDCalibTask.cxx
index 96d5eeecb2e0eb00cb2033ae2c54f3825122f277..185a18b664767c0c250b3010eb26cf44f4aef90b 100644 (file)
--- a/TRD/AliTRDCalibTask.cxx
+++ b/TRD/AliTRDCalibTask.cxx
@@ -78,7 +78,9 @@ using namespace std;
 #include "AliLog.h"
 
 #include "AliTRDCalibChamberStatus.h"
-#include "AliTRDdEdxUtils.h"
+#include "AliTRDdEdxBaseUtils.h"
+#include "AliTRDdEdxCalibHistArray.h"
+#include "AliTRDdEdxCalibUtils.h"
 
 #include "AliTRDCalibTask.h"
 
@@ -224,7 +226,7 @@ AliTRDCalibTask::~AliTRDCalibTask()
   if(fPH2dTest) delete fPH2dTest;
   if(fLinearVdriftTest) delete fLinearVdriftTest;
   if(IsPHQon()){
-    AliTRDdEdxUtils::DeleteCalibHist();
+    AliTRDdEdxCalibUtils::DeleteHistArray();
   }
 
   if(fCalDetGain) delete fCalDetGain;
@@ -350,8 +352,8 @@ void AliTRDCalibTask::UserCreateOutputObjects()
   
   if(IsPHQon()){
     printf("\n        AliTRDCalibTask PHQ is on!!     \n\n");
-    AliTRDdEdxUtils::PrintControl();
-    AliTRDdEdxUtils::IniCalibHist(fListHist, kTRUE);
+    AliTRDdEdxBaseUtils::PrintControl();
+    AliTRDdEdxCalibUtils::IniHistArray(fListHist, kTRUE);
   }
   else{
     printf("\n        AliTRDCalibTask PHQ is off!!     \n\n");
@@ -716,8 +718,9 @@ void AliTRDCalibTask::UserExec(Option_t *)
   /////////////////////////////////////
   // Loop on AliESDtrack
   ////////////////////////////////////
-  //printf("Nb of tracks %f\n",nbTracks);      
-  for(int itrk=0; itrk < nbTracks; ++itrk){
+  //printf("Nb of tracks %f\n",nbTracks); 
+  Int_t nbTracksfriends = fESDfriend->GetNumberOfTracks();     
+  for(int itrk=0; itrk < nbTracksfriends; ++itrk){
     
     // Get ESD track
     fkEsdTrack = fESD->GetTrack(itrk);
@@ -725,7 +728,10 @@ void AliTRDCalibTask::UserExec(Option_t *)
     ULong_t status = fkEsdTrack->GetStatus(); 
     if(status&(AliESDtrack::kTPCout)) ++nbtrackTPC;
     
+    // Fix suggested by Alex
     fFriendTrack = fESDfriend->GetTrack(itrk);
+    //printf("itrk %d\n",itrk);
+    //fFriendTrack = (fESDfriend->GetNumberOfTracks()>itrk)?fESDfriend->GetTrack(itrk):NULL;
     if(!fFriendTrack)  {
       //printf("No friend track %d\n",itrk);
       continue;
@@ -803,11 +809,11 @@ void AliTRDCalibTask::UserExec(Option_t *)
     }
 
     if(IsPHQon()){
-      const Double_t mag = AliTRDdEdxUtils::IsExBOn() ? fESD->GetMagneticField() : -1;
-      const Int_t charge = AliTRDdEdxUtils::IsExBOn() ? fkEsdTrack->Charge() : -1;
-      const Double_t toTPCscale = AliTRDdEdxUtils::GetCalibTPCscale(fkEsdTrack->GetTPCncls(), fkEsdTrack->GetTPCsignal());
+      const Double_t mag = AliTRDdEdxBaseUtils::IsExBOn() ? fESD->GetMagneticField() : -1;
+      const Int_t charge = AliTRDdEdxBaseUtils::IsExBOn() ? fkEsdTrack->Charge() : -1;
+      const Double_t toTPCscale = AliTRDdEdxCalibUtils::GetCalibTPCscale(fkEsdTrack->GetTPCncls(), fkEsdTrack->GetTPCsignal());
       if(toTPCscale>0){
-        AliTRDdEdxUtils::FillCalibHist(fTrdTrack, 0, mag, charge, toTPCscale);
+        AliTRDdEdxCalibUtils::FillHist(fTrdTrack, 0, mag, charge, toTPCscale);
       }
     }