]> git.uio.no Git - u/mrichter/AliRoot.git/blobdiff - TRD/AliTRDQADataMakerRec.cxx
Setters added (Magnus)
[u/mrichter/AliRoot.git] / TRD / AliTRDQADataMakerRec.cxx
index 4870dc791215d721b948c851e1f32189f7e12bf8..9b6495b3bcf5ea310dd4c4647ff5f8858117cf71 100644 (file)
@@ -42,7 +42,6 @@
 #include "AliTRDcluster.h"
 #include "AliTRDQADataMakerRec.h"
 #include "AliTRDgeometry.h"
-//#include "AliTRDdataArrayI.h"
 #include "AliTRDrawStream.h"
 
 #include "AliTRDdigitsManager.h"
@@ -410,7 +409,7 @@ void AliTRDQADataMakerRec::InitRecPoints()
   
   // chamber by chamber
   for(Int_t i=0; i<18; i++) {
-    hist[14+i] = new TH2D(Form("qaTRD_recPoints_sigTime_sm%d",i), Form("sm%d;det;time bin"), 
+    hist[14+i] = new TH2D(Form("qaTRD_recPoints_sigTime_sm%d",i), Form("sm%d;det;time bin",i), 
                        30, -0.5, 29.5, kTimeBin, -0.5, kTimeBin-0.5);
     hist[14+i]->SetMinimum(0);
     hist[14+i]->SetMaximum(150);
@@ -419,7 +418,7 @@ void AliTRDQADataMakerRec::InitRecPoints()
   // time bin by time bin sm-by-sm
   for(Int_t i=0; i<18; i++) {
     hist[14+18+i] = new TH1D(Form("qaTRD_recPoints_sigTimeShape_sm%d", i), 
-                            Form("sm%d;time bin;signal"),
+                            Form("sm%d;time bin;signal",i),
                             kTimeBin, -0.5, kTimeBin-0.5);
 
     hist[14+18+i]->SetMaximum(150);    
@@ -728,15 +727,12 @@ void AliTRDQADataMakerRec::MakeRaws(AliRawReader* rawReader)
 
   const Int_t baseline = 10;
 
-
   // configure the reader
   rawReader->Reset();
   rawReader->SelectEquipment(0, 1024, 1041);
   rawReader->Select("TRD");
 
-  AliTRDrawStreamBase::SetRawStreamVersion("FAST");
-  AliTRDrawStreamBase *data = AliTRDrawStreamBase::GetRawStream(rawReader);
-  data->SetSharedPadReadout(kFALSE);
+  AliTRDrawStream *data = new AliTRDrawStream(rawReader);
 
   // build data manager  
   AliTRDdigitsManager *digitsManager;
@@ -770,8 +766,8 @@ void AliTRDQADataMakerRec::MakeRaws(AliRawReader* rawReader)
          mADC->Fill(value);
          
          // simple clusterizer
-         if (col < 1 || col > digits->GetNcol()-1) continue;
-         if (tb < 1 || tb > digits->GetNtime()-1) continue;
+         if (col < 1 || col > digits->GetNcol()-2) continue;
+         if (tb < 1 || tb > digits->GetNtime()-2) continue;
          
          value -= baseline;
 
@@ -808,12 +804,10 @@ void AliTRDQADataMakerRec::MakeRaws(AliRawReader* rawReader)
     }    
   }
   
-  if (fErrorContainer){
-    delete [] fErrorContainer[0];
-    delete [] fErrorContainer[1];
-    delete [] fErrorContainer;
-    fErrorContainer = NULL;
-  }
+  delete [] fErrorContainer[0];
+  delete [] fErrorContainer[1];
+  delete [] fErrorContainer;
+  fErrorContainer = NULL;
   
   delete digitsManager;  
   delete data;