fix saving dEdx on ESD tracks (Markus)

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

diff --git a/TRD/AliTRDQADataMaker.cxx b/TRD/AliTRDQADataMaker.cxx
index 9d85aa652e5e079344aec12f7b829c9aaf57a5a0..98fb1834dec0bc2c49bfeeffba28bbe02d31494c 100644 (file)
--- a/TRD/AliTRDQADataMaker.cxx
+++ b/TRD/AliTRDQADataMaker.cxx
@@ -27,18 +27,16 @@
 
 // --- ROOT system ---
 #include <TClonesArray.h>
-#include <TFile.h> 
 #include <TH1D.h> 
 #include <TH2D.h>
 #include <TH3D.h>
 #include <TProfile.h>
 #include <TF1.h>
-#include <TCanvas.h>
-#include <TStopwatch.h>
 
 // --- AliRoot header files ---
 #include "AliESDEvent.h"
-#include "AliLog.h"
+#include "AliQAChecker.h"
+
 #include "AliTRDdigit.h"
 #include "AliTRDhit.h"
 #include "AliTRDcluster.h"
@@ -46,15 +44,12 @@
 #include "AliTRDdigitsManager.h"
 #include "AliTRDgeometry.h"
 #include "AliTRDarrayADC.h"
-#include "AliTRDrawStream.h"
-#include "AliTRDRawStreamV2.h"
-#include "AliQAChecker.h"
 
 ClassImp(AliTRDQADataMaker)
 
 //____________________________________________________________________________ 
   AliTRDQADataMaker::AliTRDQADataMaker() : 
-  AliQADataMaker(AliQA::GetDetName(AliQA::kTRD), "TRD Quality Assurance Data Maker")
+  AliQADataMaker(AliQAv1::GetDetName(AliQAv1::kTRD), "TRD Quality Assurance Data Maker")
 {
   //
   // Default constructor
@@ -87,7 +82,7 @@ AliTRDQADataMaker& AliTRDQADataMaker::operator=(const AliTRDQADataMaker& qadm)
 }
 
 //____________________________________________________________________________ 
-void AliTRDQADataMaker::EndOfDetectorCycle(AliQA::TASKINDEX task, TObjArray * list)
+void AliTRDQADataMaker::EndOfDetectorCycle(AliQAv1::TASKINDEX task, TObjArray * list)
 {
   //
   // Detector specific actions at end of cycle
@@ -95,10 +90,10 @@ void AliTRDQADataMaker::EndOfDetectorCycle(AliQA::TASKINDEX task, TObjArray * li
   //TStopwatch watch;
   //watch.Start();
 
-  //AliInfo(Form("EndOfCycle", "Fitting RecPoints %d", task))
+  //AliDebug(AliQAv1::GetQADebugLevel(), Form("EndOfCycle", "Fitting RecPoints %d", task))
   TH1D *hist = new TH1D("fitHist", "", 200, -0.5, 199.5);
  
-  if (task == AliQA::kRECPOINTS) {
+  if (task == AliQAv1::kRECPOINTS) {
 
     //list->Print();
     
@@ -129,7 +124,7 @@ void AliTRDQADataMaker::EndOfDetectorCycle(AliQA::TASKINDEX task, TObjArray * li
       //TH1D *test = ((TH3D*)list->At(10))->ProjectionZ(Form("ampTime_%d",i), i+1, i+1, 0, 35);     
       //if (test->GetSum() < 100) continue;
       
-      //AliInfo(Form("fitting det = %d", i));
+      //AliDebug(AliQAv1::GetQADebugLevel(), Form("fitting det = %d", i));
       
       for(Int_t j=0; j<35; j++) {
        
@@ -162,7 +157,7 @@ void AliTRDQADataMaker::EndOfDetectorCycle(AliQA::TASKINDEX task, TObjArray * li
   delete hist;
   
   // call the checker
-  AliQAChecker::Instance()->Run(AliQA::kTRD, task, list) ;    
+  AliQAChecker::Instance()->Run(AliQAv1::kTRD, task, list) ;    
 
   //watch.Stop();
   //watch.Print();
@@ -347,7 +342,7 @@ void AliTRDQADataMaker::InitSDigits()
 }
 
 //____________________________________________________________________________
-void AliTRDQADataMaker::MakeESDs(AliESDEvent * esd)
+void AliTRDQADataMaker::MakeESDs(AliESDEvent * const esd)
 {
   //
   // Make QA data from ESDs
@@ -487,7 +482,7 @@ Double_t AliTRDQADataMaker::GetExtZ(const AliExternalTrackParam *in) const
 }
 
 //____________________________________________________________________________
-void AliTRDQADataMaker::MakeHits(TClonesArray * hits)
+void AliTRDQADataMaker::MakeHits(TClonesArray * const hits)
 {
   //
   // Make QA data from Hits
@@ -542,7 +537,7 @@ void AliTRDQADataMaker::MakeHits(TTree * hitTree)
 }
 
 //____________________________________________________________________________
-void AliTRDQADataMaker::MakeDigits(TClonesArray * digits)
+void AliTRDQADataMaker::MakeDigits(TClonesArray * const digits)
 {
   //
   // Makes data from Digits
@@ -603,7 +598,7 @@ void AliTRDQADataMaker::MakeDigits(TTree * digits)
 }
 
 //____________________________________________________________________________
-void AliTRDQADataMaker::MakeSDigits(TClonesArray * sdigits)
+void AliTRDQADataMaker::MakeSDigits(TClonesArray * const sdigits)
 {
   //
   // Makes data from Digits
@@ -665,7 +660,7 @@ void AliTRDQADataMaker::MakeSDigits(TTree * digits)
 }
 
 //____________________________________________________________________________
-void AliTRDQADataMaker::MakeRaws(AliRawReader* rawReader)
+void AliTRDQADataMaker::MakeRaws(AliRawReader * const rawReader)
 {
   //
   // Makes QA data from raw data
@@ -682,33 +677,27 @@ void AliTRDQADataMaker::MakeRaws(AliRawReader* rawReader)
   const Int_t kMCM = 16;
   //  const Int_t kADC = 22;
 
-  //<<<<<<< AliTRDQADataMaker.cxx
-  //AliTRDrawStream *raw = new AliTRDrawStream(rawReader);
-  //raw->SetRawVersion(3);
-  //raw->Init();
-  //=======
-  AliTRDRawStreamV2 *raw = new AliTRDRawStreamV2(rawReader);
-  raw->SetRawVersion(3);
-  raw->Init();
-  //>>>>>>> 1.12
+  AliTRDrawStream raw(rawReader);
+  raw.SetRawVersion(3);
+  raw.Init();
 
-  while (raw->Next()) {
+  while (raw.Next()) {
 
-    GetRawsData(0)->Fill(raw->GetDet());
+    GetRawsData(0)->Fill(raw.GetDet());
 
     // possibly needs changes with the new reader !!
-    Int_t *sig = raw->GetSignals();
+    Int_t *sig = raw.GetSignals();
     for(Int_t i=0; i<3; i++) GetRawsData(1)->Fill(sig[i]);
     // ---
 
-    GetRawsData(2)->Fill(raw->GetTimeBin());
+    GetRawsData(2)->Fill(raw.GetTimeBin());
 
     // calculate the index;
-    Int_t sm = raw->GetSM();
-    Int_t roc = raw->GetROC();
-    Int_t rob = raw->GetROB();
-    Int_t mcm = raw->GetMCM();
-    //Int_t adc = raw->GetADC();
+    Int_t sm = raw.GetSM();
+    Int_t roc = raw.GetROC();
+    Int_t rob = raw.GetROB();
+    Int_t mcm = raw.GetMCM();
+    //Int_t adc = raw.GetADC();
 
     //Int_t index = roc * (kROB*kMCM*kADC) + rob * (kMCM*kADC) + mcm * kADC + adc;
     Int_t  index = roc * (kROB*kMCM) + rob * kMCM + mcm;
@@ -716,8 +705,6 @@ void AliTRDQADataMaker::MakeRaws(AliRawReader* rawReader)
     GetRawsData(4+sm)->Fill(index);
   }
 
-  delete raw;
-
 }
 
 //____________________________________________________________________________
@@ -804,7 +791,7 @@ void AliTRDQADataMaker::StartOfDetectorCycle()
 }
 
 //__________________________________________________________________________
-Int_t AliTRDQADataMaker::CheckPointer(TObject *obj, const char *name) 
+Int_t AliTRDQADataMaker::CheckPointer(TObject * const obj, const char *name) 
 {
   //
   // Checks initialization of pointers