]> git.uio.no Git - u/mrichter/AliRoot.git/blobdiff - ITS/AliITSQASPDDataMakerRec.cxx
Make and print an image of QA user flagged histograms (Yves)
[u/mrichter/AliRoot.git] / ITS / AliITSQASPDDataMakerRec.cxx
index 2df2439fb6e3d4b835c60cf725dc7557d9e8c77b..19504114450daad98a4fd2d855f20f6a763e846b 100644 (file)
@@ -12,7 +12,7 @@
  * about the suitability of this software for any purpose. It is          *
  * provided "as is" without express or implied warranty.                  *
  **************************************************************************/
-/* $Id:$  */
+/* $Id$  */
 //  *************************************************************
 //  Checks the quality assurance 
 //  by comparing with reference data
 #include "AliITSQADataMakerRec.h"
 #include "AliITSQASPDDataMakerRec.h"
 #include "AliLog.h"
-#include "AliQA.h"
+#include "AliQAv1.h"
 #include "AliRawReader.h"
+#include "AliITSRawStreamSPD.h"
+#include "AliITSRawStreamSPDErrorLog.h"
 #include "AliITSRecPoint.h"
+
 ClassImp(AliITSQASPDDataMakerRec)
 
 //____________________________________________________________________________
-AliITSQASPDDataMakerRec::AliITSQASPDDataMakerRec(AliITSQADataMakerRec *aliITSQADataMakerRec, Bool_t kMode, Short_t ldc) :
+AliITSQASPDDataMakerRec::AliITSQASPDDataMakerRec(AliITSQADataMakerRec *aliITSQADataMakerRec, Bool_t kMode, Short_t ldc, AliITSRawStreamSPDErrorLog *aliITSRawStreamSPDErrorLog) :
 TObject(),
 fAliITSQADataMakerRec(aliITSQADataMakerRec),
 fkOnline(kMode),
 fLDC(ldc),
-fSPDhRaws(0),
-fSPDhRecs(0),
-fRawsOffset(0),
-fRecsOffset(0)
+fSPDhRawsTask(0),
+fSPDhRecPointsTask(0),
+fGenRawsOffset(0),
+fGenRecPointsOffset(0),
+fAdvLogger(aliITSRawStreamSPDErrorLog) 
 {
   //ctor used to discriminate OnLine-Offline analysis  
 }
@@ -60,10 +64,11 @@ TObject(),
 fAliITSQADataMakerRec(qadm.fAliITSQADataMakerRec),
 fkOnline(qadm.fkOnline),
 fLDC(qadm.fLDC),
-fSPDhRaws(qadm.fSPDhRaws),
-fSPDhRecs(qadm.fSPDhRecs),
-fRawsOffset(qadm.fRawsOffset),
-fRecsOffset(qadm.fRecsOffset)
+fSPDhRawsTask(qadm.fSPDhRawsTask),
+fSPDhRecPointsTask(qadm.fSPDhRecPointsTask),
+fGenRawsOffset(qadm.fGenRawsOffset),
+fGenRecPointsOffset(qadm.fGenRecPointsOffset),
+fAdvLogger(qadm.fAdvLogger)
 {
   //copy ctor 
   fAliITSQADataMakerRec->SetName((const char*)qadm.fAliITSQADataMakerRec->GetName()) ; 
@@ -73,7 +78,7 @@ fRecsOffset(qadm.fRecsOffset)
 //__________________________________________________________________
 AliITSQASPDDataMakerRec::~AliITSQASPDDataMakerRec(){
   // destructor
-
+//  delete fAdvLogger;
 }
 //__________________________________________________________________
 
@@ -93,47 +98,155 @@ void AliITSQASPDDataMakerRec::StartOfDetectorCycle()
 }
 
 //____________________________________________________________________________ 
-void AliITSQASPDDataMakerRec::EndOfDetectorCycle(AliQA::TASKINDEX_t /*task*/, TObjArray* /*list*/)
+void AliITSQASPDDataMakerRec::EndOfDetectorCycle(AliQAv1::TASKINDEX_t /*task*/, TObjArray* /*list*/)
 {
   // launch the QA checking
-  AliDebug(1,"AliITSDM instantiates checker with Run(AliQA::kITS, task, list)\n"); 
+  AliDebug(1,"AliITSDM instantiates checker with Run(AliQAv1::kITS, task, list)\n"); 
   
-  //AliQAChecker::Instance()->Run( AliQA::kITS , task, list);
+  //AliQAChecker::Instance()->Run( AliQAv1::kITS , task, list);
 }
 
 //____________________________________________________________________________ 
 void AliITSQASPDDataMakerRec::InitRaws()
 { 
   // Initialization for RAW data - SPD -
-  fRawsOffset = (fAliITSQADataMakerRec->fRawsQAList)->GetEntries();
+  const Bool_t expert   = kTRUE ; 
+  const Bool_t saveCorr = kTRUE ; 
+  const Bool_t image    = kTRUE ; 
+  
+  fGenRawsOffset = (fAliITSQADataMakerRec->fRawsQAList[AliRecoParam::kDefault])->GetEntries();
+  fAdvLogger = new AliITSRawStreamSPDErrorLog();  
+  AliInfo("Book Offline Histograms for SPD\n ");
 
-  // custom code here
+  Char_t name[50];
+  Char_t title[50];
 
-  //fSPDhRaws must be incremented by one unit every time a histogram is ADDED to the QA List
+  TH1F *hlayer = new TH1F("SPDLayPattern_SPD","Layer map - SPD",6,0.,6.);
+  hlayer->GetXaxis()->SetTitle("Layer number");
+  hlayer->GetYaxis()->SetTitle("Entries");
+  fAliITSQADataMakerRec->Add2RawsList(hlayer, 0+fGenRawsOffset, expert, !image, !saveCorr);
+  fSPDhRawsTask++;
+
+  TH1F **hmod = new TH1F*[2];
+  TH2F **hhitMap = new TH2F*[20];
+  TH1F **herrors = new TH1F*[20];
+  for (Int_t iLay=0; iLay<2; iLay++) {
+    sprintf(name,"SPDModPattern_SPD%d",iLay+1);
+    sprintf(title,"Module map - SPD Layer %d",iLay+1);
+    hmod[iLay]=new TH1F(name,title,fgknSPDmodules,0,fgknSPDmodules);
+    hmod[iLay]->GetXaxis()->SetTitle("Module number");
+    hmod[iLay]->GetYaxis()->SetTitle("Entries");
+    fAliITSQADataMakerRec->Add2RawsList(hmod[iLay], 1+iLay+fGenRawsOffset, !expert, image, !saveCorr);
+    fSPDhRawsTask++;
+  }
+  for (Int_t iDDL=0; iDDL<20; iDDL++) {
+    sprintf(name,"SPDHitMap_SPD_DDL%d",iDDL+1);
+    sprintf(title,"Hit map - SPD DDL %d",iDDL+1);
+    hhitMap[iDDL]=new TH2F(name,title,320,0,10*32,1536,0,6*256);
+    hhitMap[iDDL]->GetXaxis()->SetTitle("Column");
+    hhitMap[iDDL]->GetYaxis()->SetTitle("Row");
+    fAliITSQADataMakerRec->Add2RawsList(hhitMap[iDDL], 3+(2*iDDL)+fGenRawsOffset, expert, !image, !saveCorr);
+    fSPDhRawsTask++;
+    sprintf(name,"SPDErrors_SPD_DDL%d",iDDL+1);
+    sprintf(title,"Error codes - SPD DDL %d",iDDL+1);
+    herrors[iDDL] = new TH1F (name,title,fAdvLogger->GetNrErrorCodes(),0,fAdvLogger->GetNrErrorCodes());
+    herrors[iDDL]->SetXTitle("Error Code");
+    herrors[iDDL]->SetYTitle("Nr of errors");
+    fAliITSQADataMakerRec->Add2RawsList(herrors[iDDL], 4+(2*iDDL)+fGenRawsOffset, expert, !image, !saveCorr);
+    fSPDhRawsTask++;
+  }
 
-  AliDebug(1,Form("%d SPD Raws histograms booked\n",fSPDhRaws));
+  TH1F** hMultSPDhits = new TH1F*[2];
+  for (Int_t iLay=0; iLay<2; iLay++) {
+    sprintf(name,"SPDHitsMultiplicity_SPD%d",iLay+1);
+    sprintf(title,"Hit multiplicity - SPD Layer %d",iLay+1);
+    hMultSPDhits[iLay]=new TH1F(name,title,200,0.,200.);
+    hMultSPDhits[iLay]->GetXaxis()->SetTitle("Hit multiplicity");
+    hMultSPDhits[iLay]->GetYaxis()->SetTitle("Entries");
+    fAliITSQADataMakerRec->Add2RawsList(hMultSPDhits[iLay], 43+iLay+fGenRawsOffset, expert, !image, !saveCorr);
+    fSPDhRawsTask++;
+  }
 
+  TH2F *hMultSPDhits2MultSPDhits1 
+         = new TH2F("SPDHitMultCorrelation_SPD","Hit multiplicity correlation - SPD",200,0.,200.,200,0.,200.);
+  hMultSPDhits2MultSPDhits1->GetXaxis()->SetTitle("Hit multiplicity (Layer 1)");
+  hMultSPDhits2MultSPDhits1->GetYaxis()->SetTitle("Hit multiplicity (Layer 2)");
+  fAliITSQADataMakerRec->Add2RawsList(hMultSPDhits2MultSPDhits1, 45+fGenRawsOffset, !expert, image, !saveCorr);
+  fSPDhRawsTask++;
+  AliDebug(1,Form("%d SPD Raws histograms booked\n",fSPDhRawsTask));
 }
 
 
 //____________________________________________________________________________
-void AliITSQASPDDataMakerRec::MakeRaws(AliRawReader* /*rawReader*/)
+void AliITSQASPDDataMakerRec::MakeRaws(AliRawReader* rawReader)
 { 
   // Fill QA for RAW - SPD -
+  rawReader->Reset();
+  AliITSRawStreamSPD *rawStreamSPD = new AliITSRawStreamSPD(rawReader);
+  rawStreamSPD->ActivateAdvancedErrorLog(kTRUE,fAdvLogger);
+
+  Int_t nDigitsL1 = 0;
+  Int_t nDigitsL2 = 0;
+  Int_t iEq;
+  Int_t iLayer;
+  Int_t iHalfStave, iChip;
+  Int_t col, row; 
+  UInt_t module, colM, rowM;
+  while(rawStreamSPD->Next()) {
+
+    iEq = rawReader->GetDDLID();
+    if (iEq>=0 && iEq<20) {
+      iHalfStave = rawStreamSPD->GetHalfStaveNr();
+      iChip = rawStreamSPD->GetChipAddr();
+      col  = rawStreamSPD->GetChipCol();
+      row  = rawStreamSPD->GetChipRow();
+
+      rawStreamSPD->OnlineToOffline(iEq, iHalfStave, iChip, col, row, module, colM, rowM);
+
+      if (iHalfStave>=0 && iHalfStave<2) iLayer=0;
+      else iLayer=1;
+      
+      fAliITSQADataMakerRec->GetRawsData(0+fGenRawsOffset)->Fill(iLayer);
+      if (iLayer==0) {
+        fAliITSQADataMakerRec->GetRawsData(1+fGenRawsOffset)->Fill(module);
+        nDigitsL1++;
+      } else {
+        fAliITSQADataMakerRec->GetRawsData(2+fGenRawsOffset)->Fill(module);
+        nDigitsL2++;
+      }
+      
+      fAliITSQADataMakerRec->GetRawsData((2*iEq)+3+fGenRawsOffset)->Fill(colM+(module%2)*160,rowM+iHalfStave*256);
+    }
+
+  }
+  for (Int_t ieq=0; ieq<20; ieq++)
+    for (UInt_t ierr=0; ierr<fAdvLogger->GetNrErrorCodes(); ierr++)
+      fAliITSQADataMakerRec->GetRawsData((2*ieq)+4+fGenRawsOffset)->Fill(ierr,fAdvLogger->GetNrErrors(ierr,ieq));
+
+  fAdvLogger->Reset();
+  fAliITSQADataMakerRec->GetRawsData(43+fGenRawsOffset)->Fill(nDigitsL1);
+  fAliITSQADataMakerRec->GetRawsData(44+fGenRawsOffset)->Fill(nDigitsL2);
+  fAliITSQADataMakerRec->GetRawsData(45+fGenRawsOffset)->Fill(nDigitsL1,nDigitsL2);
+  
+  delete rawStreamSPD;  
+  AliDebug(1,Form("Event completed, %d raw digits read",nDigitsL1+nDigitsL2));
 }
 
 //____________________________________________________________________________ 
 void AliITSQASPDDataMakerRec::InitRecPoints()
 {
   // Initialization for RECPOINTS - SPD -
-  fRecsOffset = (fAliITSQADataMakerRec->fRecPointsQAList)->GetEntries();
-
-
-  TH1F* hlayer= new TH1F("LayPattern_SPD","Layer map - SPD",6,0.,6.);
+  const Bool_t expert   = kTRUE ; 
+  const Bool_t image    = kTRUE ; 
+  
+  fGenRecPointsOffset = (fAliITSQADataMakerRec->fRecPointsQAList[AliRecoParam::kDefault])->GetEntries();
+  TH1F* hlayer= new TH1F("SPDLayPattern_SPD","Layer map - SPD",6,0.,6.);
   hlayer->GetXaxis()->SetTitle("Layer number");
   hlayer->GetYaxis()->SetTitle("Entries");
-  fAliITSQADataMakerRec->Add2RecPointsList(hlayer, fSPDhRecs+fRecsOffset); 
-  fSPDhRecs++;
+  fAliITSQADataMakerRec->Add2RecPointsList(hlayer, 0+fGenRecPointsOffset, expert, !image); 
+  fSPDhRecPointsTask++;
 
   TH1F** hmod = new TH1F*[2];
   TH1F** hxl  = new TH1F*[2];
@@ -153,118 +266,119 @@ void AliITSQASPDDataMakerRec::InitRecPoints()
   Char_t name[50];
   Char_t title[50];
   for (Int_t iLay=0;iLay<2;iLay++) {
-    sprintf(name,"ModPattern_SPD%d",iLay+1);
+    sprintf(name,"SPDModPattern_SPD%d",iLay+1);
     sprintf(title,"Module map - SPD Layer %d",iLay+1);
     hmod[iLay]=new TH1F(name,title,fgknSPDmodules,0,fgknSPDmodules);
     hmod[iLay]->GetXaxis()->SetTitle("Module number");
     hmod[iLay]->GetYaxis()->SetTitle("Entries");
-    fAliITSQADataMakerRec->Add2RecPointsList(hmod[iLay], fSPDhRecs +fRecsOffset); 
-    fSPDhRecs++;
+    fAliITSQADataMakerRec->Add2RecPointsList(hmod[iLay], 1+(10*iLay)+fGenRecPointsOffset, expert, !image); 
+    fSPDhRecPointsTask++;
 
-    sprintf(name,"xLoc_SPD%d",iLay+1);
+    sprintf(name,"SPDxLoc_SPD%d",iLay+1);
     sprintf(title,"Local x coordinate - SPD Layer %d",iLay+1);
     hxl[iLay]=new TH1F(name,title,100,-4.,4.);
     hxl[iLay]->GetXaxis()->SetTitle("Local x [cm]");
     hxl[iLay]->GetYaxis()->SetTitle("Entries");
-    fAliITSQADataMakerRec->Add2RecPointsList(hxl[iLay], fSPDhRecs +fRecsOffset);
-    fSPDhRecs++;
+    fAliITSQADataMakerRec->Add2RecPointsList(hxl[iLay], 2+(10*iLay)+fGenRecPointsOffset, expert, !image);
+    fSPDhRecPointsTask++;
 
-    sprintf(name,"zLoc_SPD%d",iLay+1);
+    sprintf(name,"SPDzLoc_SPD%d",iLay+1);
     sprintf(title,"Local z coordinate - SPD Layer %d",iLay+1);
     hzl[iLay]=new TH1F(name,title,100,-4.,4.);
     hzl[iLay]->GetXaxis()->SetTitle("Local z [cm]");
     hzl[iLay]->GetYaxis()->SetTitle("Entries");
-    fAliITSQADataMakerRec->Add2RecPointsList(hzl[iLay], fSPDhRecs+fRecsOffset); 
-    fSPDhRecs++;
+    fAliITSQADataMakerRec->Add2RecPointsList(hzl[iLay], 3+(10*iLay)+fGenRecPointsOffset, expert, !image); 
+    fSPDhRecPointsTask++;
 
-    sprintf(name,"xGlob_SPD%d",iLay+1);
+    sprintf(name,"SPDxGlob_SPD%d",iLay+1);
     sprintf(title,"Global x coordinate - SPD Layer %d",iLay+1);
     hxg[iLay]=new TH1F(name,title,100,-xlim[iLay],xlim[iLay]);
     hxg[iLay]->GetXaxis()->SetTitle("Global x [cm]");
     hxg[iLay]->GetYaxis()->SetTitle("Entries");
-    fAliITSQADataMakerRec->Add2RecPointsList(hxg[iLay],fSPDhRecs+fRecsOffset);  
-    fSPDhRecs++;
+    fAliITSQADataMakerRec->Add2RecPointsList(hxg[iLay],4+(10*iLay)+fGenRecPointsOffset, expert, !image);  
+    fSPDhRecPointsTask++;
 
-    sprintf(name,"yGlob_SPD%d",iLay+1);
+    sprintf(name,"SPDyGlob_SPD%d",iLay+1);
     sprintf(title,"Global y coordinate - SPD Layer %d",iLay+1);
     hyg[iLay]=new TH1F(name,title,100,-xlim[iLay],xlim[iLay]);
     hyg[iLay]->GetXaxis()->SetTitle("Global y [cm]");
     hyg[iLay]->GetYaxis()->SetTitle("Entries");
-    fAliITSQADataMakerRec->Add2RecPointsList(hyg[iLay], fSPDhRecs+fRecsOffset); 
-    fSPDhRecs++;
+    fAliITSQADataMakerRec->Add2RecPointsList(hyg[iLay], 5+(10*iLay)+fGenRecPointsOffset, expert, !image); 
+    fSPDhRecPointsTask++;
 
-    sprintf(name,"zGlob_SPD%d",iLay+1);
+    sprintf(name,"SPDzGlob_SPD%d",iLay+1);
     sprintf(title,"Global z coordinate - SPD Layer %d",iLay+1);
     hzg[iLay]=new TH1F(name,title,150,-zlim[iLay],zlim[iLay]);
     hzg[iLay]->GetXaxis()->SetTitle("Global z [cm]");
     hzg[iLay]->GetYaxis()->SetTitle("Entries");
-    fAliITSQADataMakerRec->Add2RecPointsList(hzg[iLay], fSPDhRecs+fRecsOffset); 
-    fSPDhRecs++;
+    fAliITSQADataMakerRec->Add2RecPointsList(hzg[iLay], 6+(10*iLay)+fGenRecPointsOffset, expert, !image); 
+    fSPDhRecPointsTask++;
 
-    sprintf(name,"r_SPD%d",iLay+1);
+    sprintf(name,"SPDr_SPD%d",iLay+1);
     sprintf(title,"Radius - SPD Layer %d",iLay+1);
     hr[iLay]=new TH1F(name,title,100,0.,10.);
     hr[iLay]->GetXaxis()->SetTitle("r [cm]");
     hr[iLay]->GetYaxis()->SetTitle("Entries");
-    fAliITSQADataMakerRec->Add2RecPointsList(hr[iLay], fSPDhRecs+fRecsOffset);  
-    fSPDhRecs++;
+    fAliITSQADataMakerRec->Add2RecPointsList(hr[iLay], 7+(10*iLay)+fGenRecPointsOffset, expert, !image);  
+    fSPDhRecPointsTask++;
 
-    sprintf(name,"phi_SPD%d",iLay+1);
+    sprintf(name,"SPDphi_SPD%d",iLay+1);
     sprintf(title,"#varphi - SPD Layer %d",iLay+1);
-    hphi[iLay]=new TH1F(name,title,600,0.,2*TMath::Pi());
+    hphi[iLay]=new TH1F(name,title,1000,0.,2*TMath::Pi());
     hphi[iLay]->GetXaxis()->SetTitle("#varphi [rad]");
     hphi[iLay]->GetYaxis()->SetTitle("Entries");
-    fAliITSQADataMakerRec->Add2RecPointsList(hphi[iLay], fSPDhRecs+fRecsOffset);
-    fSPDhRecs++;
+    fAliITSQADataMakerRec->Add2RecPointsList(hphi[iLay], 8+(10*iLay)+fGenRecPointsOffset, expert, !image);
+    fSPDhRecPointsTask++;
     
-    sprintf(name,"SizeYvsZ_SPD%d",iLay+1);
+    sprintf(name,"SPDSizeYvsZ_SPD%d",iLay+1);
     sprintf(title,"Cluster dimension - SPD Layer %d",iLay+1);
     hNyNz[iLay]=new TH2F(name,title,100,0.,100.,100,0.,100.);
     hNyNz[iLay]->GetXaxis()->SetTitle("z length");
     hNyNz[iLay]->GetYaxis()->SetTitle("y length");
-    fAliITSQADataMakerRec->Add2RecPointsList(hNyNz[iLay], fSPDhRecs+fRecsOffset); 
-    fSPDhRecs++;
+    fAliITSQADataMakerRec->Add2RecPointsList(hNyNz[iLay], 9+(10*iLay)+fGenRecPointsOffset, expert, !image); 
+    fSPDhRecPointsTask++;
 
-    sprintf(name,"phi_z_SPD%d",iLay+1);
+    sprintf(name,"SPDphi_z_SPD%d",iLay+1);
     sprintf(title,"#varphi vs z - SPD Layer %d",iLay+1);
-    hPhiZ[iLay]=new TH2F(name,title,150,-zlim[iLay],zlim[iLay],100,0.,2*TMath::Pi());
+    hPhiZ[iLay]=new TH2F(name,title,150,-zlim[iLay],zlim[iLay],200,0.,2*TMath::Pi());
     hPhiZ[iLay]->GetXaxis()->SetTitle("Global z [cm]");
     hPhiZ[iLay]->GetYaxis()->SetTitle("#varphi [rad]");
-    fAliITSQADataMakerRec->Add2RecPointsList(hPhiZ[iLay], fSPDhRecs+fRecsOffset);
-    fSPDhRecs++;
+    fAliITSQADataMakerRec->Add2RecPointsList(hPhiZ[iLay], 10+(10*iLay)+fGenRecPointsOffset, !expert, image);
+    fSPDhRecPointsTask++;
 
   }
 
-  TH2F *hrPhi=new TH2F("r_phi_SPD","#varphi vs r - SPD",100,0.,10.,100,0.,2*TMath::Pi());
+  TH2F *hrPhi=new TH2F("SPDr_phi_SPD","#varphi vs r - SPD",100,0.,10.,100,0.,2*TMath::Pi());
   hrPhi->GetXaxis()->SetTitle("r [cm]");
   hrPhi->GetYaxis()->SetTitle("#varphi [rad]");
-  fAliITSQADataMakerRec->Add2RecPointsList(hrPhi, fSPDhRecs+fRecsOffset);
-  fSPDhRecs++;
+  fAliITSQADataMakerRec->Add2RecPointsList(hrPhi, 21+fGenRecPointsOffset, expert, !image);
+  fSPDhRecPointsTask++;
 
-  TH2F *hxy=new TH2F("x_y_SPD","Global y vs x - SPD",200,-10.,10.,200,-10.,10.);
+  TH2F *hxy=new TH2F("SPDx_y_SPD","Global y vs x - SPD",200,-10.,10.,200,-10.,10.);
   hxy->GetXaxis()->SetTitle("Global x [cm]");
   hxy->GetYaxis()->SetTitle("Global y [cm]");
-  fAliITSQADataMakerRec->Add2RecPointsList(hxy, fSPDhRecs+fRecsOffset);
-  fSPDhRecs++;
+  fAliITSQADataMakerRec->Add2RecPointsList(hxy, 22+fGenRecPointsOffset, !expert, image);
+  fSPDhRecPointsTask++;
 
   for (Int_t iLay=0;iLay<2;iLay++) {
-    sprintf(name,"Multiplicity_SPD%d",iLay+1);
+    sprintf(name,"SPDMultiplicity_SPD%d",iLay+1);
     sprintf(title,"Cluster multiplicity - SPD Layer %d",iLay+1);
     hMultSPDcl[iLay]=new TH1F(name,title,200,0.,200.);
     hMultSPDcl[iLay]->GetXaxis()->SetTitle("Cluster multiplicity");
     hMultSPDcl[iLay]->GetYaxis()->SetTitle("Entries");
-    fAliITSQADataMakerRec->Add2RecPointsList(hMultSPDcl[iLay], fSPDhRecs+fRecsOffset);
-    fSPDhRecs++;
+    fAliITSQADataMakerRec->Add2RecPointsList(hMultSPDcl[iLay], 23+iLay+fGenRecPointsOffset, !expert, image);
+    fSPDhRecPointsTask++;
   } 
 
   TH2F *hMultSPDcl2MultSPDcl1 =
-            new TH2F("MultCorrelation_SPD","Cluster multiplicity correlation - SPD",200,0.,200.,200,0.,200.);
+        new TH2F("SPDMultCorrelation_SPD","Cluster multiplicity correlation - SPD",200,0.,200.,200,0.,200.);
   hMultSPDcl2MultSPDcl1->GetXaxis()->SetTitle("Clusters multiplicity (Layer 1)");
   hMultSPDcl2MultSPDcl1->GetYaxis()->SetTitle("Clusters multiplicity (Layer 2)"); 
-  fAliITSQADataMakerRec->Add2RecPointsList(hMultSPDcl2MultSPDcl1, fSPDhRecs+fRecsOffset);
-  fSPDhRecs++;
+  fAliITSQADataMakerRec->Add2RecPointsList(hMultSPDcl2MultSPDcl1, 25+fGenRecPointsOffset, !expert, image);
+  fSPDhRecPointsTask++;
+
+  AliDebug(1,Form("%d SPD Recs histograms booked\n",fSPDhRecPointsTask));
 
-  AliDebug(1,Form("%d SPD Recs histograms booked\n",fSPDhRecs));
 
 }
 
@@ -272,71 +386,106 @@ void AliITSQASPDDataMakerRec::InitRecPoints()
 void AliITSQASPDDataMakerRec::MakeRecPoints(TTree * clusterTree)
 {
   // Fill QA for RecPoints - SPD -
-      TClonesArray* itsClusters = new TClonesArray("AliITSRecPoint");
-      TBranch* itsClusterBranch=clusterTree->GetBranch("ITSRecPoints");
-      if (!itsClusterBranch) {
-        AliError("can't get the branch with the ITS clusters !");
-        return;
-      }
-      itsClusterBranch->SetAddress(&itsClusters);
-      Int_t nItsMods = (Int_t)clusterTree->GetEntries();
-
-      Float_t cluGlo[3] = {0.,0.,0.};
-      Int_t nClusters[2] = {0,0};
-
-      for (Int_t iIts=0; iIts < nItsMods; iIts++) {
-
-      if (!clusterTree->GetEvent(iIts))    continue;
-      Int_t nCluster = itsClusters->GetEntriesFast();
-      // loop over clusters
-      while(nCluster--) {
-        AliITSRecPoint* cluster = (AliITSRecPoint*)itsClusters->UncheckedAt(nCluster);
-
-        if (cluster->GetLayer()>1)        continue;
-        Int_t lay=cluster->GetLayer();
-        fAliITSQADataMakerRec->GetRecPointsData(0 +fRecsOffset)->Fill(lay);
-        cluster->GetGlobalXYZ(cluGlo);
-        Float_t rad=TMath::Sqrt(cluGlo[0]*cluGlo[0]+cluGlo[1]*cluGlo[1]);
+  static TClonesArray statITSCluster("AliITSRecPoint");
+  TClonesArray *ITSCluster = &statITSCluster;
+  TBranch* itsClusterBranch=clusterTree->GetBranch("ITSRecPoints");
+  if (!itsClusterBranch) {
+    AliError("can't get the branch with the ITS clusters !");
+    return;
+  }
+  itsClusterBranch->SetAddress(&ITSCluster);
+  Int_t nItsMods = (Int_t)clusterTree->GetEntries();
+  
+  Float_t cluGlo[3] = {0.,0.,0.};
+  Int_t nClusters[2] = {0,0};
+  
+  for (Int_t iIts=0; iIts < nItsMods; iIts++) {
+    
+    if (!clusterTree->GetEvent(iIts))    continue;
+    Int_t nCluster = ITSCluster->GetEntriesFast();
+    // loop over clusters
+    while(nCluster--) {
+      AliITSRecPoint* cluster = (AliITSRecPoint*)ITSCluster->UncheckedAt(nCluster);
+      
+      if (cluster->GetLayer()>1)        continue;
+      Int_t lay=cluster->GetLayer();
+      fAliITSQADataMakerRec->GetRecPointsData(0 +fGenRecPointsOffset)->Fill(lay);
+      cluster->GetGlobalXYZ(cluGlo);
+      Float_t rad=TMath::Sqrt(cluGlo[0]*cluGlo[0]+cluGlo[1]*cluGlo[1]);
         Float_t phi= TMath::Pi() + TMath::ATan2(-cluGlo[1],-cluGlo[0]);
         if (lay==0) {
-         fAliITSQADataMakerRec->GetRecPointsData(1 +fRecsOffset)->Fill(iIts);
-         fAliITSQADataMakerRec->GetRecPointsData(2 +fRecsOffset)->Fill(cluster->GetDetLocalX());
-         fAliITSQADataMakerRec->GetRecPointsData(3 +fRecsOffset)->Fill(cluster->GetDetLocalZ());
-         fAliITSQADataMakerRec->GetRecPointsData(4 +fRecsOffset)->Fill(cluGlo[0]);
-         fAliITSQADataMakerRec->GetRecPointsData(5 +fRecsOffset)->Fill(cluGlo[1]);
-         fAliITSQADataMakerRec->GetRecPointsData(6 +fRecsOffset)->Fill(cluGlo[2]);
-         fAliITSQADataMakerRec->GetRecPointsData(7 +fRecsOffset)->Fill(rad);
-         fAliITSQADataMakerRec->GetRecPointsData(8 +fRecsOffset)->Fill(phi);
-         fAliITSQADataMakerRec->GetRecPointsData(9 +fRecsOffset)->Fill(cluster->GetNz(),cluster->GetNy());
-         fAliITSQADataMakerRec->GetRecPointsData(10 +fRecsOffset)->Fill(cluGlo[2],phi);
+         fAliITSQADataMakerRec->GetRecPointsData(1 +fGenRecPointsOffset)->Fill(iIts);
+         fAliITSQADataMakerRec->GetRecPointsData(2 +fGenRecPointsOffset)->Fill(cluster->GetDetLocalX());
+         fAliITSQADataMakerRec->GetRecPointsData(3 +fGenRecPointsOffset)->Fill(cluster->GetDetLocalZ());
+         fAliITSQADataMakerRec->GetRecPointsData(4 +fGenRecPointsOffset)->Fill(cluGlo[0]);
+         fAliITSQADataMakerRec->GetRecPointsData(5 +fGenRecPointsOffset)->Fill(cluGlo[1]);
+         fAliITSQADataMakerRec->GetRecPointsData(6 +fGenRecPointsOffset)->Fill(cluGlo[2]);
+         fAliITSQADataMakerRec->GetRecPointsData(7 +fGenRecPointsOffset)->Fill(rad);
+         fAliITSQADataMakerRec->GetRecPointsData(8 +fGenRecPointsOffset)->Fill(phi);
+         fAliITSQADataMakerRec->GetRecPointsData(9 +fGenRecPointsOffset)->Fill(cluster->GetNz(),cluster->GetNy());
+         fAliITSQADataMakerRec->GetRecPointsData(10 +fGenRecPointsOffset)->Fill(cluGlo[2],phi);
        } else  {
-          fAliITSQADataMakerRec->GetRecPointsData(11 +fRecsOffset)->Fill(iIts);
-          fAliITSQADataMakerRec->GetRecPointsData(12 +fRecsOffset)->Fill(cluster->GetDetLocalX());
-          fAliITSQADataMakerRec->GetRecPointsData(13 +fRecsOffset)->Fill(cluster->GetDetLocalZ());
-          fAliITSQADataMakerRec->GetRecPointsData(14 +fRecsOffset)->Fill(cluGlo[0]);
-          fAliITSQADataMakerRec->GetRecPointsData(15 +fRecsOffset)->Fill(cluGlo[1]);
-          fAliITSQADataMakerRec->GetRecPointsData(16 +fRecsOffset)->Fill(cluGlo[2]);
-          fAliITSQADataMakerRec->GetRecPointsData(17 +fRecsOffset)->Fill(rad);
-          fAliITSQADataMakerRec->GetRecPointsData(18 +fRecsOffset)->Fill(phi);
-          fAliITSQADataMakerRec->GetRecPointsData(19 +fRecsOffset)->Fill(cluster->GetNz(),cluster->GetNy());
-          fAliITSQADataMakerRec->GetRecPointsData(20 +fRecsOffset)->Fill(cluGlo[2],phi);
+          fAliITSQADataMakerRec->GetRecPointsData(11 +fGenRecPointsOffset)->Fill(iIts);
+          fAliITSQADataMakerRec->GetRecPointsData(12 +fGenRecPointsOffset)->Fill(cluster->GetDetLocalX());
+          fAliITSQADataMakerRec->GetRecPointsData(13 +fGenRecPointsOffset)->Fill(cluster->GetDetLocalZ());
+          fAliITSQADataMakerRec->GetRecPointsData(14 +fGenRecPointsOffset)->Fill(cluGlo[0]);
+          fAliITSQADataMakerRec->GetRecPointsData(15 +fGenRecPointsOffset)->Fill(cluGlo[1]);
+          fAliITSQADataMakerRec->GetRecPointsData(16 +fGenRecPointsOffset)->Fill(cluGlo[2]);
+          fAliITSQADataMakerRec->GetRecPointsData(17 +fGenRecPointsOffset)->Fill(rad);
+          fAliITSQADataMakerRec->GetRecPointsData(18 +fGenRecPointsOffset)->Fill(phi);
+          fAliITSQADataMakerRec->GetRecPointsData(19 +fGenRecPointsOffset)->Fill(cluster->GetNz(),cluster->GetNy());
+          fAliITSQADataMakerRec->GetRecPointsData(20 +fGenRecPointsOffset)->Fill(cluGlo[2],phi);
         }
-        fAliITSQADataMakerRec->GetRecPointsData(21 +fRecsOffset)->Fill(rad,phi);
-        fAliITSQADataMakerRec->GetRecPointsData(22 +fRecsOffset)->Fill(cluGlo[0],cluGlo[1]);
-
+        fAliITSQADataMakerRec->GetRecPointsData(21 +fGenRecPointsOffset)->Fill(rad,phi);
+        fAliITSQADataMakerRec->GetRecPointsData(22 +fGenRecPointsOffset)->Fill(cluGlo[0],cluGlo[1]);
+       
        nClusters[lay]++; 
-      } // end of cluster loop
-    } // end of its "subdetector" loop
+    } // end of cluster loop
+  } // end of its "subdetector" loop
+  
+  for (Int_t iLay=0; iLay<2; iLay++)
+    fAliITSQADataMakerRec->GetRecPointsData(23+iLay +fGenRecPointsOffset)->Fill(nClusters[iLay]);
+  
+  fAliITSQADataMakerRec->GetRecPointsData(25 +fGenRecPointsOffset)->Fill(nClusters[0],nClusters[1]);
+  
+  statITSCluster.Clear();
+}
 
-    for (Int_t iLay=0; iLay<2; iLay++)
-      fAliITSQADataMakerRec->GetRecPointsData(23+iLay +fRecsOffset)->Fill(nClusters[iLay]);
 
-    fAliITSQADataMakerRec->GetRecPointsData(25 +fRecsOffset)->Fill(nClusters[0],nClusters[1]);
 
-    if (itsClusters) {
-      itsClusters->Delete();
-      delete itsClusters;
-      itsClusters = 0;
-    }
+//_______________________________________________________________
+
+Int_t AliITSQASPDDataMakerRec::GetOffset(AliQAv1::TASKINDEX_t task) {
+  // Returns offset number according to the specified task
+  Int_t offset=0;
+  if( task == AliQAv1::kRAWS ) {
+    offset=fGenRawsOffset;
+  }
+  else if( task == AliQAv1::kRECPOINTS ) {
+    offset=fGenRecPointsOffset;
+  }
+  else {
+    AliInfo("No task has been selected. Offset set to zero.\n");
+  }
+
+  return offset;
+}
+
+//_______________________________________________________________
+
+Int_t AliITSQASPDDataMakerRec::GetTaskHisto(AliQAv1::TASKINDEX_t task) {
+  // Returns the number of histograms associated to the specified task
+  Int_t histotot=0;
+
+  if( task == AliQAv1::kRAWS ) {
+    histotot=fSPDhRawsTask;
+  }
+  else if( task == AliQAv1::kRECPOINTS ){
+    histotot=fSPDhRecPointsTask;
+  }
+  else {
+    AliInfo("No task has been selected. TaskHisto set to zero.\n");
+  }
 
+  return histotot;
 }