Printout fixed.

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

diff --git a/TRD/AliTRDQADataMaker.cxx b/TRD/AliTRDQADataMaker.cxx
index 9d85aa652e5e079344aec12f7b829c9aaf57a5a0..1b0c6baa427437faa62d46bd4271b927400e8c04 100644 (file)
--- a/TRD/AliTRDQADataMaker.cxx
+++ b/TRD/AliTRDQADataMaker.cxx
@@ -47,14 +47,13 @@
 #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 +86,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 +94,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 +128,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 +161,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();
@@ -682,33 +681,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 +709,6 @@ void AliTRDQADataMaker::MakeRaws(AliRawReader* rawReader)
     GetRawsData(4+sm)->Fill(index);
   }
 
-  delete raw;
-
 }
 
 //____________________________________________________________________________