]> git.uio.no Git - u/mrichter/AliRoot.git/blobdiff - ITS/AliITSQASSDDataMakerRec.cxx
Fixes for reading zero-suppressed data. These should be propagated to
[u/mrichter/AliRoot.git] / ITS / AliITSQASSDDataMakerRec.cxx
index f80d4405a3a55b4551b9a76d6952f70533435a71..b503785b3bb4e96fe3040d47b03cba5061b9130f 100644 (file)
 #include "AliITSgeomTGeo.h"
 #include "AliRawEventHeaderBase.h"
 #include "AliITSRecPoint.h"
+#include "AliITSBadChannelsSSDv2.h"
 
 #include "AliCDBManager.h"
 #include "AliCDBEntry.h"
-#include "AliESDEvent.h"
-#include "AliESDtrack.h"
 
 ClassImp(AliITSQASSDDataMakerRec)
 
@@ -54,41 +53,51 @@ AliITSQASSDDataMakerRec::AliITSQASSDDataMakerRec(AliITSQADataMakerRec *aliITSQAD
 TObject(),
 fAliITSQADataMakerRec(aliITSQADataMakerRec),
 fSSDEvent(0),
+fSSDEventPerCycle(0),
 fkOnline(kMode),
 fLDC(ldc),
-fSSDRawsOffset(0),
-fSSDhRaws(0),
-fSSDhRecs(0),
-fSSDhESDs(0),
-fGenOffset(0) {
+fSSDRawsOffset(0), fSSDRawsDAOffset(0),
+fSSDRawsCommonLevelOffset(0),
+fSSDhTask(0),
+fGenOffset(0),
+fGenRawsOffset(0),
+fGenRecPointsOffset(0),
+fCDBManager(0) {
   // Default constructor   
   //initilize the raw signal vs strip number histograms
-  Int_t fLayer = 0,fLadder = 0, fModule = 0;
-  TString fTitle; Int_t fHistCounter = 0;
   if(fkOnline) {
-    AliCDBManager * man = AliCDBManager::Instance();
-    man->SetDefaultStorage("local://$ALICE_ROOT");
+    fCDBManager = AliCDBManager::Instance();
+    //fCDBManager->SetDefaultStorage("local://$ALICE_ROOT");
+    fCDBManager->SetDefaultStorage(gSystem->Getenv("AMORE_CDB_URI"));
     Int_t runNumber = atoi(gSystem->Getenv("DATE_RUN_NUMBER"));
     if(!runNumber) 
       AliInfo("DATE_RUN_NUMBER not defined!!!\n");
-
-    man->SetRun(runNumber);
-    AliCDBEntry *geomGRP = man->Get("GRP/Geometry/Data");
+    
+    fCDBManager->SetRun(runNumber);
+    AliCDBEntry *geomGRP = fCDBManager->Get("GRP/Geometry/Data");
     if(!geomGRP) AliInfo("GRP geometry not found!!!\n");
+    
+    Int_t gLayer = 0,gLadder = 0, gModule = 0;
+    Int_t gHistCounter = 0;
+    TString gTitle; 
 
-    for(Int_t i = 500; i < fgkSSDMODULES + 500; i++) {
-      AliITSgeomTGeo::GetModuleId(i,fLayer,fLadder,fModule);
-      fTitle = "SSD_RawSignal_Layer"; fTitle += fLayer;
-      fTitle += "_Ladder"; fTitle += fLadder;
-      fTitle += "_Module"; fTitle += fModule; 
-      fHistSSDRawSignalModule[fHistCounter] = new TH1D(fTitle.Data(),fTitle.Data(),1540,0,1540);
-      fHistCounter += 1;
-    }
+    for(Int_t iModule = 500; iModule < fgkSSDMODULES + 500; iModule++) {
+      AliITSgeomTGeo::GetModuleId(iModule,gLayer,gLadder,gModule);
+      gTitle = "SSD_RawSignal_Layer"; gTitle += gLayer;
+      gTitle += "_Ladder"; gTitle += gLadder;
+      gTitle += "_Module"; gTitle += gModule;
+      fHistSSDRawSignalModule[gHistCounter] = new TH1D(gTitle.Data(),gTitle.Data(),
+                                                      2*fgkNumberOfPSideStrips,0,2*fgkNumberOfPSideStrips);
+      gHistCounter += 1;
+      
+      for(Int_t iStrip = 0; iStrip < 2*fgkNumberOfPSideStrips; iStrip++)
+       fOccupancyMatrix[iModule-500][iStrip] = 0; 
+    }//module loop
   }//online flag
   else {
-    for(Int_t i = 0; i < fgkSSDMODULES; i++) {
-      fHistSSDRawSignalModule[i]=NULL;
-    }
+    for(Int_t iModule = 0; iModule < fgkSSDMODULES; iModule++) 
+      fHistSSDRawSignalModule[iModule]=NULL;
+    fCDBManager = NULL;
   }
 }
 
@@ -97,13 +106,16 @@ AliITSQASSDDataMakerRec::AliITSQASSDDataMakerRec(const AliITSQASSDDataMakerRec&
 TObject(),
 fAliITSQADataMakerRec(qadm.fAliITSQADataMakerRec),
 fSSDEvent(qadm.fSSDEvent),
+fSSDEventPerCycle(qadm.fSSDEventPerCycle),
 fkOnline(qadm.fkOnline),
 fLDC(qadm.fLDC),
-fSSDRawsOffset(qadm.fSSDRawsOffset),
-fSSDhRaws(qadm.fSSDhRaws),
-fSSDhRecs(qadm.fSSDhRecs),
-fSSDhESDs(qadm.fSSDhESDs),
-fGenOffset(qadm.fGenOffset) {
+fSSDRawsOffset(qadm.fSSDRawsOffset), fSSDRawsDAOffset(qadm.fSSDRawsDAOffset),
+fSSDRawsCommonLevelOffset(qadm.fSSDRawsCommonLevelOffset),
+fSSDhTask(qadm.fSSDhTask),
+fGenOffset(qadm.fGenRawsOffset),
+fGenRawsOffset(qadm.fGenRawsOffset),
+fGenRecPointsOffset(qadm.fGenRecPointsOffset),
+fCDBManager(qadm.fCDBManager) {
   //copy ctor 
   fAliITSQADataMakerRec->SetName((const char*)qadm.fAliITSQADataMakerRec->GetName()) ; 
   fAliITSQADataMakerRec->SetTitle((const char*)qadm.fAliITSQADataMakerRec->GetTitle());
@@ -121,51 +133,162 @@ AliITSQASSDDataMakerRec& AliITSQASSDDataMakerRec::operator = (const AliITSQASSDD
 //__________________________________________________________________
 AliITSQASSDDataMakerRec::~AliITSQASSDDataMakerRec() {
   // destructor
-  for(Int_t i = 0; i < fgkSSDMODULES; i++) 
-    if(fHistSSDRawSignalModule[i]) delete fHistSSDRawSignalModule[i];
+  for(Int_t iModule = 0; iModule < fgkSSDMODULES; iModule++)
+    if(fHistSSDRawSignalModule[iModule]) delete fHistSSDRawSignalModule[iModule];
+  if(fCDBManager) delete fCDBManager;
 }
 
 //____________________________________________________________________________ 
 void AliITSQASSDDataMakerRec::StartOfDetectorCycle()
 {
+  if (  fAliITSQADataMakerRec->GetRawsData(0) == NULL ) // Raws not defined
+    return ; 
+
   //Detector specific actions at start of cycle
-  AliDebug(1,"AliITSQADM::Start of SSD Cycle\n");
+  AliDebug(1,"AliITSQADM::Start of SSD Cycle\n");    
+
+  //Data size per DDL
+  ((TH1D *)(fAliITSQADataMakerRec->GetRawsData(fGenRawsOffset+4)))->Reset();
+  //Data size per LDC
+  ((TH1D *)(fAliITSQADataMakerRec->GetRawsData(fGenRawsOffset+22)))->Reset();
+
+  //online part
+  if(fkOnline) {
+    for(Int_t iModule = 500; iModule < fgkSSDMODULES + 500; iModule++) {
+      for(Int_t iStrip = 0; iStrip < 2*fgkNumberOfPSideStrips; iStrip++)
+       fOccupancyMatrix[iModule-500][iStrip] = 0; 
+    }//module loop
+
+    Int_t gHistPositionOccupancyPerLadder = 0;
+    Int_t gLayer = 0, gLadder = 0, gModule = 0;
+    for(Int_t iModule = 0; iModule < fgkSSDMODULES; iModule++) {
+      AliITSgeomTGeo::GetModuleId(iModule+500,gLayer,gLadder,gModule);
+      
+      gHistPositionOccupancyPerLadder = (gLayer == 5) ? 2*(gLadder - 1) : 2*(gLadder - 1 + fgkSSDLADDERSLAYER5);
+      
+      //P-SIDE OCCUPANCY
+      fAliITSQADataMakerRec->GetRawsData(fGenRawsOffset+fSSDRawsCommonLevelOffset+fgkSSDMODULES+gHistPositionOccupancyPerLadder)->Reset();
+      //N-SIDE OCCUPANCY
+      fAliITSQADataMakerRec->GetRawsData(fGenRawsOffset+fSSDRawsCommonLevelOffset+fgkSSDMODULES+gHistPositionOccupancyPerLadder+1)->Reset();
+
+      ((TH2D *)fAliITSQADataMakerRec->GetRawsData(fGenRawsOffset+fSSDRawsCommonLevelOffset+fgkSSDMODULES+2*fgkSSDLADDERSLAYER5+2*fgkSSDLADDERSLAYER6))->Reset();
+      ((TH2D *)fAliITSQADataMakerRec->GetRawsData(fGenRawsOffset+fSSDRawsCommonLevelOffset+fgkSSDMODULES+2*fgkSSDLADDERSLAYER5+2*fgkSSDLADDERSLAYER6+1))->Reset();
+    }//module loop
+  }//online flag
 }
 
 //____________________________________________________________________________ 
 void AliITSQASSDDataMakerRec::EndOfDetectorCycle(AliQA::TASKINDEX_t task, TObjArray* list)
 {
+  // launch the QA checking
+  if (  fAliITSQADataMakerRec->GetRawsData(0) == NULL ) // Raws not defined
+    return ; 
   // launch the QA checking
   AliDebug(1,"AliITSDM instantiates checker with Run(AliQA::kITS, task, list)\n"); 
+  AliInfo(Form("Offset: %d\n",fGenRawsOffset));
+  //Data size per DDL
+  for(Int_t i = 0; i < fgkNumOfDDLs; i++) {
+    Double_t gSizePerDDL = TMath::Power(10,(fAliITSQADataMakerRec->GetRawsData(fGenRawsOffset+5+i))->GetMean())/1e+06;
+    //cout<<"DDL: "<<i+2<<" - Size: "<<gSizePerDDL<<" - Mean: "<<
+    //(fAliITSQADataMakerRec->GetRawsData(fGenRawsOffset+5+i))->GetMean()<<endl;
+    ((TH1D *)(fAliITSQADataMakerRec->GetRawsData(fGenRawsOffset+4)))->SetBinContent(i+2,gSizePerDDL);
+  }
   
-  //scaling SSD occupancy plots
+  //Data size per LDC
+  for(Int_t i = 0; i < fgkNumOfLDCs; i++) {
+    Double_t gSizePerLDC = TMath::Power(10,(fAliITSQADataMakerRec->GetRawsData(fGenRawsOffset+23+i))->GetMean())/1e+06;
+    ((TH1D *)(fAliITSQADataMakerRec->GetRawsData(fGenRawsOffset+22)))->SetBinContent(i+6,gSizePerLDC);
+  }
+
+  //online part
   if(fkOnline) {
-    if(fSSDEvent != 0) {
-      ((TH2F *)fAliITSQADataMakerRec->GetRawsData(fGenOffset+28))->Scale(1./fSSDEvent);
-      ((TH2F *)fAliITSQADataMakerRec->GetRawsData(fGenOffset+29))->Scale(1./fSSDEvent);
-    }
-    Int_t fLayer = 0, fLadder = 0;
-    Int_t fOccPosition = 0; 
-    for(Int_t iLayer = 5; iLayer < 7; iLayer++) {
-      for(Int_t iLadder = 1; iLadder < AliITSgeomTGeo::GetNLadders(iLayer) + 1; iLadder++) {
-       fOccPosition  = (fLayer == 5) ? fLadder : fLadder + fgkSSDLADDERSLAYER5;
-       if(fSSDEvent != 0) {
-         //P-SIDE OCCUPANCY - scaling
-         fAliITSQADataMakerRec->GetRawsData(fGenOffset + fSSDRawsOffset - 1 + 2*fOccPosition - 1)->Scale(1./fSSDEvent);
-         //N-SIDE OCCUPANCY - scaling
-         fAliITSQADataMakerRec->GetRawsData(fGenOffset + fSSDRawsOffset - 1 + 2*fOccPosition)->Scale(1./fSSDEvent);
-       }//ssd events != 0
-      }//ladder loop
-    }//layer loop
+    //Output of the DA
+    MonitorOCDBObjects();
+
+    Int_t gHistPositionOccupancyPerModule = 0;
+    Int_t gLayer = 0, gLadder = 0, gModule = 0;
+    //occupancy per module
+    for(Int_t iModule = 0; iModule < fgkSSDMODULES; iModule++) {
+      AliITSgeomTGeo::GetModuleId(iModule+500,gLayer,gLadder,gModule);
+
+      gHistPositionOccupancyPerModule = (gLayer == 5) ? ((gLadder - 1)*fgkSSDMODULESPERLADDERLAYER5 + gModule - 1) : ((gLadder - 1)*fgkSSDMODULESPERLADDERLAYER6 + gModule + fgkSSDMODULESLAYER5 - 1);
+      for(Int_t iBins = 1; iBins < fHistSSDRawSignalModule[iModule]->GetXaxis()->GetNbins(); iBins++)
+       fAliITSQADataMakerRec->GetRawsData(fGenRawsOffset+fSSDRawsCommonLevelOffset+gHistPositionOccupancyPerModule)->SetBinContent(iBins,fOccupancyMatrix[iModule][iBins-1]);
+      
+      if(fSSDEventPerCycle != 0)
+       ((TH1F *)(fAliITSQADataMakerRec->GetRawsData(fGenRawsOffset+fSSDRawsCommonLevelOffset+gHistPositionOccupancyPerModule)))->Scale(100./fSSDEventPerCycle);
+    }//module loop
+
+    //occupancy per ladder
+    Int_t gHistPositionOccupancyPerLadder = 0;
+    Int_t lLadderLocationY = 0;
+    Double_t occupancy = 0.0, occupancyThreshold = 0.0, occupancyAverage = 0.0;
+    for(Int_t iModule = 0; iModule < fgkSSDMODULES; iModule++) {
+      AliITSgeomTGeo::GetModuleId(iModule+500,gLayer,gLadder,gModule);
+      
+      gHistPositionOccupancyPerModule = (gLayer == 5) ? ((gLadder - 1)*fgkSSDMODULESPERLADDERLAYER5 + gModule - 1) : ((gLadder - 1)*fgkSSDMODULESPERLADDERLAYER6 + gModule + fgkSSDMODULESLAYER5 - 1);
+      gHistPositionOccupancyPerLadder = (gLayer == 5) ? 2*(gLadder - 1) : 2*(gLadder - 1 + fgkSSDLADDERSLAYER5);
+      
+      //P-SIDE OCCUPANCY
+      occupancy = GetOccupancyModule((TH1 *)fAliITSQADataMakerRec->GetRawsData(fGenRawsOffset+fSSDRawsCommonLevelOffset+gHistPositionOccupancyPerModule),0,0,0);
+      occupancyThreshold = GetOccupancyModule((TH1 *)fAliITSQADataMakerRec->GetRawsData(fGenRawsOffset+fSSDRawsCommonLevelOffset+gHistPositionOccupancyPerModule),0,1,3);
+      occupancyAverage = GetOccupancyModule((TH1 *)fAliITSQADataMakerRec->GetRawsData(fGenRawsOffset+fSSDRawsCommonLevelOffset+gHistPositionOccupancyPerModule),0,2,0);
+
+      fAliITSQADataMakerRec->GetRawsData(fGenRawsOffset+fSSDRawsCommonLevelOffset+fgkSSDMODULES+gHistPositionOccupancyPerLadder)->Fill(gModule,occupancy);
+      lLadderLocationY = 3*gLadder; // sideP=1 sideN=0 
+      if(gLayer == 5) {
+       //occupancy per module - no threshold
+        ((TH2D *)fAliITSQADataMakerRec->GetRawsData(fGenRawsOffset+fSSDRawsCommonLevelOffset+fgkSSDMODULES+2*fgkSSDLADDERSLAYER5+2*fgkSSDLADDERSLAYER6))->SetBinContent(gModule,lLadderLocationY,occupancy);
+       //occupancy per module - threshold @ 3%
+        ((TH2D *)fAliITSQADataMakerRec->GetRawsData(fGenRawsOffset+fSSDRawsCommonLevelOffset+fgkSSDMODULES+2*fgkSSDLADDERSLAYER5+2*fgkSSDLADDERSLAYER6+2))->SetBinContent(gModule,lLadderLocationY,occupancyThreshold);
+       //average occupancy per module
+        ((TH2D *)fAliITSQADataMakerRec->GetRawsData(fGenRawsOffset+fSSDRawsCommonLevelOffset+fgkSSDMODULES+2*fgkSSDLADDERSLAYER5+2*fgkSSDLADDERSLAYER6+4))->SetBinContent(gModule,lLadderLocationY,occupancyAverage);
+      }
+      else if(gLayer == 6) {
+       //occupancy per module - no threshold
+        ((TH2D *)fAliITSQADataMakerRec->GetRawsData(fGenRawsOffset+fSSDRawsCommonLevelOffset+fgkSSDMODULES+2*fgkSSDLADDERSLAYER5+2*fgkSSDLADDERSLAYER6+1))->SetBinContent(gModule,lLadderLocationY,occupancy);
+       //occupancy per module - threshold @ 3%
+        ((TH2D *)fAliITSQADataMakerRec->GetRawsData(fGenRawsOffset+fSSDRawsCommonLevelOffset+fgkSSDMODULES+2*fgkSSDLADDERSLAYER5+2*fgkSSDLADDERSLAYER6+3))->SetBinContent(gModule,lLadderLocationY,occupancyThreshold);
+       //average occupancy per module
+        ((TH2D *)fAliITSQADataMakerRec->GetRawsData(fGenRawsOffset+fSSDRawsCommonLevelOffset+fgkSSDMODULES+2*fgkSSDLADDERSLAYER5+2*fgkSSDLADDERSLAYER6+5))->SetBinContent(gModule,lLadderLocationY,occupancyAverage);
+      }
+
+      //N-SIDE OCCUPANCY
+      occupancy = GetOccupancyModule((TH1 *)fAliITSQADataMakerRec->GetRawsData(fGenRawsOffset+fSSDRawsCommonLevelOffset+gHistPositionOccupancyPerModule),1,0,0);   
+      occupancyThreshold = GetOccupancyModule((TH1 *)fAliITSQADataMakerRec->GetRawsData(fGenRawsOffset+fSSDRawsCommonLevelOffset+gHistPositionOccupancyPerModule),1,1,3);   
+      occupancyAverage = GetOccupancyModule((TH1 *)fAliITSQADataMakerRec->GetRawsData(fGenRawsOffset+fSSDRawsCommonLevelOffset+gHistPositionOccupancyPerModule),1,2,0);   
+
+      fAliITSQADataMakerRec->GetRawsData(fGenRawsOffset+fSSDRawsCommonLevelOffset+fgkSSDMODULES+gHistPositionOccupancyPerLadder+1)->Fill(gModule,occupancy);
+      if(gLayer == 5) {
+       //occupancy per module - no threshold
+        ((TH2D *)fAliITSQADataMakerRec->GetRawsData(fGenRawsOffset+fSSDRawsCommonLevelOffset+fgkSSDMODULES+2*fgkSSDLADDERSLAYER5+2*fgkSSDLADDERSLAYER6))->SetBinContent(gModule,lLadderLocationY-1,occupancy);
+       //occupancy per module - threshold @ 3%
+        ((TH2D *)fAliITSQADataMakerRec->GetRawsData(fGenRawsOffset+fSSDRawsCommonLevelOffset+fgkSSDMODULES+2*fgkSSDLADDERSLAYER5+2*fgkSSDLADDERSLAYER6+2))->SetBinContent(gModule,lLadderLocationY-1,occupancyThreshold);
+       //average occupancy per module
+        ((TH2D *)fAliITSQADataMakerRec->GetRawsData(fGenRawsOffset+fSSDRawsCommonLevelOffset+fgkSSDMODULES+2*fgkSSDLADDERSLAYER5+2*fgkSSDLADDERSLAYER6+4))->SetBinContent(gModule,lLadderLocationY-1,occupancyAverage);
+      }
+      else if(gLayer == 6) {
+       //occupancy per module - no threshold
+        ((TH2D *)fAliITSQADataMakerRec->GetRawsData(fGenRawsOffset+fSSDRawsCommonLevelOffset+fgkSSDMODULES+2*fgkSSDLADDERSLAYER5+2*fgkSSDLADDERSLAYER6+1))->SetBinContent(gModule,lLadderLocationY-1,occupancy);
+       //occupancy per module - threshold @ 3%
+        ((TH2D *)fAliITSQADataMakerRec->GetRawsData(fGenRawsOffset+fSSDRawsCommonLevelOffset+fgkSSDMODULES+2*fgkSSDLADDERSLAYER5+2*fgkSSDLADDERSLAYER6+3))->SetBinContent(gModule,lLadderLocationY-1,occupancyThreshold);
+       //average occupancy per module
+        ((TH2D *)fAliITSQADataMakerRec->GetRawsData(fGenRawsOffset+fSSDRawsCommonLevelOffset+fgkSSDMODULES+2*fgkSSDLADDERSLAYER5+2*fgkSSDLADDERSLAYER6+5))->SetBinContent(gModule,lLadderLocationY-1,occupancyAverage);
+      }
+    }//module loop
   }//online flag for SSD
+
+  fSSDEventPerCycle = 0;
+  
   AliQAChecker::Instance()->Run( AliQA::kITS , task, list);
 }
 
 //____________________________________________________________________________ 
 void AliITSQASSDDataMakerRec::InitRaws() {  
-
   // Initialization for RAW data - SSD -
   fGenOffset = (fAliITSQADataMakerRec->fRawsQAList)->GetEntries();
+  fGenRawsOffset = (fAliITSQADataMakerRec->fRawsQAList)->GetEntries();
 
   if(fkOnline) {
     AliInfo("Book Online Histograms for SSD\n");
@@ -173,460 +296,877 @@ void AliITSQASSDDataMakerRec::InitRaws() {
   else {
     AliInfo("Book Offline Histograms for SSD\n ");
   }
-  AliInfo(Form("Number of histograms (SPD+SDD): %d\n",fGenOffset));
-  TString fTitle = 0;
-  //book online QA histos
-    TH1F *fHistSSDEventType = new TH1F("fHistSSDEventType",
-                                      ";Event type;Events",
-                                      31,-1,30);
-    fAliITSQADataMakerRec->Add2RawsList(fHistSSDEventType, 
-                                       fGenOffset+fSSDRawsOffset);
-    fSSDRawsOffset += 1;
-    TH1F *fHistSSDDataSize = new TH1F("fHistSSDDataSize",
-                                     ";log(SSD data size) [Bytes];Events",
-                                     100,3,8);
-    fAliITSQADataMakerRec->Add2RawsList(fHistSSDDataSize, 
-                                       fGenOffset+fSSDRawsOffset);
-    fSSDRawsOffset += 1;
-    TH1F *fHistSSDDataSizePercentage = new TH1F("fHistSSDDataSizePercentage",
-                                               ";SSD data size [%];Events",
-                                               100,0,100);
-    fAliITSQADataMakerRec->Add2RawsList(fHistSSDDataSizePercentage, 
-                                       fGenOffset+fSSDRawsOffset);
-    fSSDRawsOffset += 1;
-    TH1F *fHistSSDDDLId = new TH1F("fHistSSDDDLId",
-                                  ";DDL id;Events",20,510.5,530.5);
-    fAliITSQADataMakerRec->Add2RawsList(fHistSSDDDLId, 
-                                       fGenOffset+fSSDRawsOffset);
+  AliInfo(Form("Number of histograms (SPD+SDD): %d\n",fGenRawsOffset));
+  TString gTitle = 0;
+  //book online-offline QA histos
+  TH1D *fHistSSDEventType = new TH1D("SSD/DataSize/fHistSSDEventType",
+                                    ";Event type;Events",
+                                    31,-1,30);
+  fAliITSQADataMakerRec->Add2RawsList(fHistSSDEventType, 
+                                     fGenRawsOffset+fSSDRawsOffset, kTRUE);
+  fSSDRawsOffset += 1;
+  TH1D *fHistSSDDataSize = new TH1D("SSD/DataSize/fHistSSDDataSize",
+                                   ";log(SSD data size) [Bytes];Events",
+                                   100,3,8);
+  fAliITSQADataMakerRec->Add2RawsList(fHistSSDDataSize, 
+                                     fGenRawsOffset+fSSDRawsOffset, kTRUE);
+  fSSDRawsOffset += 1;
+  TH1D *fHistSSDDataSizePercentage = new TH1D("SSD/DataSize/fHistSSDDataSizePercentage",
+                                             ";SSD data size [%];Events",
+                                             100,0,100);
+  fAliITSQADataMakerRec->Add2RawsList(fHistSSDDataSizePercentage, 
+                                     fGenRawsOffset+fSSDRawsOffset, kTRUE);
+  fSSDRawsOffset += 1;
+  TH1D *fHistSSDDDLId = new TH1D("SSD/DDL/fHistSSDDDLId",
+                                ";DDL id;Events",20,510.5,530.5);
+  fAliITSQADataMakerRec->Add2RawsList(fHistSSDDDLId, 
+                                     fGenRawsOffset+fSSDRawsOffset, kTRUE);
+  fSSDRawsOffset += 1;
+  TH1D *fHistSSDDataSizePerDDL = new TH1D("SSD/DataSize/fHistSSDDataSizePerDDL",
+                                         ";DDL id;<SSD data size> [MB]",
+                                         20,510.5,530.5);
+  fAliITSQADataMakerRec->Add2RawsList(fHistSSDDataSizePerDDL, 
+                                     fGenRawsOffset+fSSDRawsOffset);
+  fSSDRawsOffset += 1;
+  TH1D *fHistSSDDataSizeDDL[fgkNumOfDDLs];
+  for(Int_t i = 1; i < fgkNumOfDDLs+1; i++) {
+    gTitle = "SSD/DDL/fHistSSDDataSizeDDL"; gTitle += i+511;
+    fHistSSDDataSizeDDL[i-1] = new TH1D(gTitle.Data(),
+                                       ";log(SSD data size) [Bytes];Events",
+                                       100,1,8);
+    fAliITSQADataMakerRec->Add2RawsList(fHistSSDDataSizeDDL[i-1], 
+                                       fGenRawsOffset+fSSDRawsOffset, kTRUE);
     fSSDRawsOffset += 1;
-    TH1F *fHistSSDDataSizePerDDL = new TH1F("fHistSSDDataSizePerDDL",
-                                           ";DDL id;<SSD data size> [MB]",
-                                           20,510.5,530.5);
-    fAliITSQADataMakerRec->Add2RawsList(fHistSSDDataSizePerDDL, 
-                                       fGenOffset+fSSDRawsOffset);
-    fSSDRawsOffset += 1;
-    TH1F *fHistSSDDataSizeDDL[fgkNumOfDDLs];
-    for(Int_t i = 1; i < fgkNumOfDDLs+1; i++) {
-      fTitle = "fHistSSDDataSizeDDL"; fTitle += i+511;
-      fHistSSDDataSizeDDL[i-1] = new TH1F(fTitle.Data(),
-                                         ";log(SSD data size) [Bytes];Events",
-                                         100,1,8);
-      fAliITSQADataMakerRec->Add2RawsList(fHistSSDDataSizeDDL[i-1], 
-                                         fGenOffset+fSSDRawsOffset);
-      fSSDRawsOffset += 1;
-    }
-    
-    TH1F *fHistSSDLDCId = new TH1F("fHistSSDLDCId",";LDC id;Events",10,0.5,10.5);
-    fAliITSQADataMakerRec->Add2RawsList(fHistSSDLDCId, 
-                                       fGenOffset+fSSDRawsOffset);
-    fSSDRawsOffset += 1;
-    TH1F *fHistSSDDataSizePerLDC = new TH1F("fHistSSDDataSizePerLDC",
-                                           ";LDC id;<SSD data size> [MB]",
-                                           100,0,20);
-    fAliITSQADataMakerRec->Add2RawsList(fHistSSDDataSizePerLDC, 
-                                       fGenOffset+fSSDRawsOffset);
+  }
+  
+  TH1D *fHistSSDLDCId = new TH1D("SSD/LDC/fHistSSDLDCId",";LDC id;Events",10,0.5,10.5);
+  fAliITSQADataMakerRec->Add2RawsList(fHistSSDLDCId, 
+                                     fGenRawsOffset+fSSDRawsOffset, kTRUE);
+  fSSDRawsOffset += 1;
+  TH1D *fHistSSDDataSizePerLDC = new TH1D("SSD/DataSize/fHistSSDDataSizePerLDC",
+                                         ";LDC id;<SSD data size> [MB]",
+                                         20,0.5,20.5);
+  fAliITSQADataMakerRec->Add2RawsList(fHistSSDDataSizePerLDC, 
+                                     fGenRawsOffset+fSSDRawsOffset);
+  fSSDRawsOffset += 1;
+  TH1D *fHistSSDDataSizeLDC[fgkNumOfLDCs];
+  for(Int_t i = 1; i < fgkNumOfLDCs+1; i++) {
+    gTitle = "SSD/LDC/fHistSSDDataSizeLDC"; 
+    if(i == 1) gTitle += "082";
+    if(i == 2) gTitle += "086";
+    if(i == 3) gTitle += "085";
+    fHistSSDDataSizeLDC[i-1] = new TH1D(gTitle.Data(),
+                                       ";log(SSD data size) [Bytes];Events",
+                                       100,1,8);
+    fAliITSQADataMakerRec->Add2RawsList(fHistSSDDataSizeLDC[i-1], 
+                                       fGenRawsOffset+fSSDRawsOffset, kTRUE);
     fSSDRawsOffset += 1;
-    TH1F *fHistSSDDataSizeLDC[fgkNumOfLDCs];
-    for(Int_t i = 1; i < fgkNumOfLDCs+1; i++) {
-      fTitle = "fHistSSDDataSizeLDC"; fTitle += i;
-      fHistSSDDataSizeLDC[i-1] = new TH1F(fTitle.Data(),
-                                         ";log(SSD data size) [Bytes];Events",
-                                         100,1,8);
-      fAliITSQADataMakerRec->Add2RawsList(fHistSSDDataSizeLDC[i-1], 
-                                         fGenOffset+fSSDRawsOffset);
+  }
+  fSSDRawsCommonLevelOffset = fSSDRawsOffset;
+
+  if(fkOnline) {
+    Int_t gLayer = 0, gLadder = 0, gModule = 0;
+    //occupancy per SSD module
+    TH1D *fHistSSDOccupancyModule[fgkSSDMODULES]; 
+    for(Int_t i = 500; i < fgkSSDMODULES + 500; i++) {
+      AliITSgeomTGeo::GetModuleId(i,gLayer,gLadder,gModule);
+      gTitle = "SSD/Occupancy/Layer"; gTitle += gLayer;
+      gTitle += "/Ladder"; 
+      if(gLayer == 5) {
+       gTitle +=  499+gLadder;
+       gTitle += "/fHistSSD_Occupancy_Layer"; gTitle += gLayer;
+       gTitle += "_Ladder"; 
+       gTitle += 499+gLadder;
+      }
+      if(gLayer == 6) {
+       gTitle += 599+gLadder;
+       gTitle += "/fHistSSD_Occupancy_Layer"; gTitle += gLayer;
+       gTitle += "_Ladder"; 
+       gTitle += 599+gLadder;
+      }
+      gTitle += "_Module"; gTitle += gModule; 
+      fHistSSDOccupancyModule[i-500] = new TH1D(gTitle.Data(),gTitle.Data(),
+                                               2*fgkNumberOfPSideStrips,0,2*fgkNumberOfPSideStrips);
+      fHistSSDOccupancyModule[i-500]->GetXaxis()->SetTitleColor(1);
+      fHistSSDOccupancyModule[i-500]->GetXaxis()->SetTitle("N_{strip}");
+      fHistSSDOccupancyModule[i-500]->GetYaxis()->SetTitle("Occupancy [%]");
+      fAliITSQADataMakerRec->Add2RawsList(fHistSSDOccupancyModule[i-500], 
+                                         fGenRawsOffset+fSSDRawsOffset, kTRUE);
       fSSDRawsOffset += 1;
     }
-  if(fkOnline) {
+
+    //Occupancy per SSD ladder
+    Int_t occupancyCounter = 0;
+    TH1D *fHistSSDOccupancyLadder[2*(fgkSSDLADDERSLAYER5 + fgkSSDLADDERSLAYER6)];
+    for(Int_t iLayer = 5; iLayer < 7; iLayer++) {
+      for(Int_t iLadder = 1; iLadder < AliITSgeomTGeo::GetNLadders(iLayer) + 1; iLadder++) {
+       //P-side occupancy plots
+       gTitle = "SSD/Occupancy/Layer"; gTitle += iLayer;
+       gTitle += "/Ladder";
+       if(iLayer == 5) {
+         gTitle += 499+iLadder;
+         gTitle += "/fHistSSD_Occupancy_Layer"; gTitle += iLayer;
+         gTitle += "_Ladder"; 
+         gTitle += 499+iLadder;
+       }
+       if(iLayer == 6) {
+         gTitle += 599+iLadder;
+         gTitle += "/fHistSSD_Occupancy_Layer"; gTitle += iLayer;
+         gTitle += "_Ladder"; 
+         gTitle += 599+iLadder;
+       }
+       gTitle += "_PSide";
+       fHistSSDOccupancyLadder[occupancyCounter] = new TH1D(gTitle.Data(),
+                                                            gTitle.Data(),
+                                                            AliITSgeomTGeo::GetNDetectors(iLayer),
+                                                            0.5,AliITSgeomTGeo::GetNDetectors(iLayer)+0.5);
+       fHistSSDOccupancyLadder[occupancyCounter]->GetXaxis()->SetTitleColor(1);
+       fHistSSDOccupancyLadder[occupancyCounter]->GetXaxis()->SetTitle("Module number");
+       fHistSSDOccupancyLadder[occupancyCounter]->GetYaxis()->SetTitle("Occupancy [%]");
+       fAliITSQADataMakerRec->Add2RawsList(fHistSSDOccupancyLadder[occupancyCounter], 
+                                           fGenRawsOffset+fSSDRawsOffset, kTRUE);
+       occupancyCounter += 1; fSSDRawsOffset += 1;
+       //N-side occupancy plots
+       gTitle = "SSD/Occupancy/Layer"; gTitle += iLayer;
+       gTitle += "/Ladder";
+       if(iLayer == 5) {
+         gTitle += 499+iLadder;
+         gTitle += "/fHistSSD_Occupancy_Layer"; gTitle += iLayer;
+         gTitle += "_Ladder"; 
+         gTitle += 499+iLadder;
+       }
+       if(iLayer == 6) {
+         gTitle += 599+iLadder;
+         gTitle += "/fHistSSD_Occupancy_Layer"; gTitle += iLayer;
+         gTitle += "_Ladder"; 
+         gTitle += 599+iLadder;
+       }
+       gTitle += "_NSide";
+       fHistSSDOccupancyLadder[occupancyCounter] = new TH1D(gTitle.Data(),
+                                                            gTitle.Data(),
+                                                            AliITSgeomTGeo::GetNDetectors(iLayer),
+                                                            0.5,AliITSgeomTGeo::GetNDetectors(iLayer)+0.5);
+       fHistSSDOccupancyLadder[occupancyCounter]->GetXaxis()->SetTitleColor(1);
+       fHistSSDOccupancyLadder[occupancyCounter]->GetXaxis()->SetTitle("Module number");
+       fHistSSDOccupancyLadder[occupancyCounter]->GetYaxis()->SetTitle("Occupancy [%]");
+       fAliITSQADataMakerRec->Add2RawsList(fHistSSDOccupancyLadder[occupancyCounter], 
+                                           fGenRawsOffset+fSSDRawsOffset, kTRUE);
+       occupancyCounter += 1; fSSDRawsOffset += 1;
+      }//ladder loop
+    }//layer loop
+
     //top level occupancy plots
-    TH2D *fHistSSDOccupancyLayer5 = new TH2D("fHistSSDOccupancyLayer5",
+    //occupancy per module - no threshold
+    TH2D *fHistSSDOccupancyLayer5 = new TH2D("SSD/Occupancy/Layer5/fHistSSDOccupancyLayer5",
                                             ";N_{modules};N_{Ladders}",
                                             fgkSSDMODULESPERLADDERLAYER5,
                                             0,fgkSSDMODULESPERLADDERLAYER5,
                                             3*fgkSSDLADDERSLAYER5,
-                                            0,fgkSSDLADDERSLAYER5);  
+                                            5000,500+fgkSSDLADDERSLAYER5);  
+    fHistSSDOccupancyLayer5->SetTitle("Occupancy per module (Layer 5) - No threshold");
+    fHistSSDOccupancyLayer5->GetZaxis()->SetRangeUser(0.0,100.0);
     Char_t fLabel[3];
     for(Int_t iBin = 1; iBin < fgkSSDMODULESPERLADDERLAYER5 + 1; iBin++){
       sprintf(fLabel,"%d",iBin);
       fHistSSDOccupancyLayer5->GetXaxis()->SetBinLabel(iBin,fLabel);
     }
-    fAliITSQADataMakerRec->Add2RawsList(fHistSSDOccupancyLayer5, fGenOffset+fSSDRawsOffset);
+    fAliITSQADataMakerRec->Add2RawsList(fHistSSDOccupancyLayer5, 
+                                       fGenRawsOffset+fSSDRawsOffset, kTRUE);
     fSSDRawsOffset += 1;
-    TH2D *fHistSSDOccupancyLayer6 = new TH2D("fHistSSDOccupancyLayer6",
+    TH2D *fHistSSDOccupancyLayer6 = new TH2D("SSD/Occupancy/Layer6/fHistSSDOccupancyLayer6",
                                             ";N_{modules};N_{Ladders}",
                                             fgkSSDMODULESPERLADDERLAYER6,
                                             0,fgkSSDMODULESPERLADDERLAYER6,
                                             3*fgkSSDLADDERSLAYER6,
-                                            0,fgkSSDLADDERSLAYER6);
+                                            600,600+fgkSSDLADDERSLAYER6);
+    fHistSSDOccupancyLayer6->SetTitle("Occupancy per module (Layer 6) - No threshold");
+    fHistSSDOccupancyLayer6->GetZaxis()->SetRangeUser(0.0,100.0);
     for(Int_t iBin = 1; iBin < fgkSSDMODULESPERLADDERLAYER6 + 1; iBin++){
       sprintf(fLabel,"%d",iBin);
       fHistSSDOccupancyLayer6->GetXaxis()->SetBinLabel(iBin,fLabel);
     }
-    fAliITSQADataMakerRec->Add2RawsList(fHistSSDOccupancyLayer6, fGenOffset+fSSDRawsOffset);
+    fAliITSQADataMakerRec->Add2RawsList(fHistSSDOccupancyLayer6, 
+                                       fGenRawsOffset+fSSDRawsOffset, kTRUE);
     fSSDRawsOffset += 1;
 
-    //Occupancy per ladder
-    fSSDhRaws = fSSDRawsOffset;
-    TH1D *fHistOccupancyLadder[2*(fgkSSDLADDERSLAYER5 + fgkSSDLADDERSLAYER6)];
-    for(Int_t iLayer = 5; iLayer < 7; iLayer++) {
-      for(Int_t iLadder = 1; iLadder < AliITSgeomTGeo::GetNLadders(iLayer) + 1; iLadder++) {
-       //P-side occupancy plots
-       fTitle = "fHistSSD_Occupancy_Layer"; fTitle += iLayer;
-       fTitle += "_Ladder"; fTitle += iLadder; fTitle += "_PSide";
-       fHistOccupancyLadder[fSSDhRaws] = 
-         new TH1D(fTitle.Data(),
-                  fTitle.Data(),
-                  AliITSgeomTGeo::GetNDetectors(iLayer),
-                  0.5,AliITSgeomTGeo::GetNDetectors(iLayer)+0.5);
-       fHistOccupancyLadder[fSSDhRaws]->GetXaxis()->SetTitleColor(1);
-       fHistOccupancyLadder[fSSDhRaws]->GetXaxis()->SetTitle("Module number");
-       fHistOccupancyLadder[fSSDhRaws]->GetYaxis()->SetTitle("Occupancy [%]");
-       fAliITSQADataMakerRec->Add2RawsList(fHistOccupancyLadder[fSSDhRaws], 
-                                           fGenOffset+fSSDhRaws);      
-       fSSDhRaws++;
-       //N-side occupancy plots
-       fTitle = "fHistSSD_Occupancy_Layer"; fTitle += iLayer;
-       fTitle += "_Ladder"; fTitle += iLadder; fTitle += "_NSide";
-       fHistOccupancyLadder[fSSDhRaws] = 
-         new TH1D(fTitle.Data(),
-                  fTitle.Data(),
-                  AliITSgeomTGeo::GetNDetectors(iLayer),
-                  0.5,AliITSgeomTGeo::GetNDetectors(iLayer)+0.5);
-       fHistOccupancyLadder[fSSDhRaws]->GetXaxis()->SetTitleColor(1);
-       fHistOccupancyLadder[fSSDhRaws]->GetXaxis()->SetTitle("Module number");
-       fHistOccupancyLadder[fSSDhRaws]->GetYaxis()->SetTitle("Occupancy [%]");
-       fAliITSQADataMakerRec->Add2RawsList(fHistOccupancyLadder[fSSDhRaws], 
-                                           fGenOffset+fSSDhRaws);      
-       fSSDhRaws++;
-      }//ladder loop
-    }//layer loop
+    //occupancy per module - threshold @ 3%
+    TH2D *fHistSSDOccupancyThresholdLayer5 = new TH2D("SSD/Occupancy/Layer5/fHistSSDOccupancyThresholdLayer5",
+                                            ";N_{modules};N_{Ladders}",
+                                            fgkSSDMODULESPERLADDERLAYER5,
+                                            0,fgkSSDMODULESPERLADDERLAYER5,
+                                            3*fgkSSDLADDERSLAYER5,
+                                            500,500+fgkSSDLADDERSLAYER5);  
+    fHistSSDOccupancyThresholdLayer5->SetTitle("Occupancy per module (Layer 5) - Threshold 3%");
+    fHistSSDOccupancyThresholdLayer5->GetZaxis()->SetRangeUser(3.0,10.0);
+    for(Int_t iBin = 1; iBin < fgkSSDMODULESPERLADDERLAYER5 + 1; iBin++){
+      sprintf(fLabel,"%d",iBin);
+      fHistSSDOccupancyThresholdLayer5->GetXaxis()->SetBinLabel(iBin,fLabel);
+     }
+     fAliITSQADataMakerRec->Add2RawsList(fHistSSDOccupancyThresholdLayer5, 
+                                        fGenRawsOffset+fSSDRawsOffset, kTRUE);
+    fSSDRawsOffset += 1;
+    TH2D *fHistSSDOccupancyThresholdLayer6 = new TH2D("SSD/Occupancy/Layer6/fHistSSDOccupancyThresholdLayer6",
+                                            ";N_{modules};N_{Ladders}",
+                                            fgkSSDMODULESPERLADDERLAYER6,
+                                            0,fgkSSDMODULESPERLADDERLAYER6,
+                                            3*fgkSSDLADDERSLAYER6,
+                                            600,600+fgkSSDLADDERSLAYER6);
+    fHistSSDOccupancyThresholdLayer6->SetTitle("Occupancy per module (Layer 6) - Threshold 3%");
+    fHistSSDOccupancyThresholdLayer6->GetZaxis()->SetRangeUser(3.0,10.0);
+    for(Int_t iBin = 1; iBin < fgkSSDMODULESPERLADDERLAYER6 + 1; iBin++){
+      sprintf(fLabel,"%d",iBin);
+      fHistSSDOccupancyThresholdLayer6->GetXaxis()->SetBinLabel(iBin,fLabel);
+    }
+    fAliITSQADataMakerRec->Add2RawsList(fHistSSDOccupancyThresholdLayer6, 
+                                       fGenRawsOffset+fSSDRawsOffset, kTRUE);
+    fSSDRawsOffset += 1;
+
+    //Average occupancy per module
+    TH2D *fHistSSDAverageOccupancyLayer5 = new TH2D("SSD/Occupancy/Layer5/fHistSSDAverageOccupancyLayer5",
+                                            ";N_{modules};N_{Ladders}",
+                                            fgkSSDMODULESPERLADDERLAYER5,
+                                            0,fgkSSDMODULESPERLADDERLAYER5,
+                                            3*fgkSSDLADDERSLAYER5,
+                                            500,500+fgkSSDLADDERSLAYER5);  
+    fHistSSDAverageOccupancyLayer5->SetTitle("Average occupancy per module (Layer 5)");
+    fHistSSDAverageOccupancyLayer5->GetZaxis()->SetRangeUser(0.0,5.0);
+    for(Int_t iBin = 1; iBin < fgkSSDMODULESPERLADDERLAYER5 + 1; iBin++){
+      sprintf(fLabel,"%d",iBin);
+      fHistSSDAverageOccupancyLayer5->GetXaxis()->SetBinLabel(iBin,fLabel);
+    }
+    fAliITSQADataMakerRec->Add2RawsList(fHistSSDAverageOccupancyLayer5, 
+                                       fGenRawsOffset+fSSDRawsOffset);
+    fSSDRawsOffset += 1;
+    TH2D *fHistSSDAverageOccupancyLayer6 = new TH2D("SSD/Occupancy/Layer6/fHistSSDAverageOccupancyLayer6",
+                                            ";N_{modules};N_{Ladders}",
+                                            fgkSSDMODULESPERLADDERLAYER6,
+                                            0,fgkSSDMODULESPERLADDERLAYER6,
+                                            3*fgkSSDLADDERSLAYER6,
+                                            600,600+fgkSSDLADDERSLAYER6);
+    fHistSSDAverageOccupancyLayer6->SetTitle("Average occupancy per module (Layer 6)");
+    fHistSSDAverageOccupancyLayer6->GetZaxis()->SetRangeUser(0.0,5.0);
+    for(Int_t iBin = 1; iBin < fgkSSDMODULESPERLADDERLAYER6 + 1; iBin++){
+      sprintf(fLabel,"%d",iBin);
+      fHistSSDAverageOccupancyLayer6->GetXaxis()->SetBinLabel(iBin,fLabel);
+    }
+    fAliITSQADataMakerRec->Add2RawsList(fHistSSDAverageOccupancyLayer6, 
+                                       fGenRawsOffset+fSSDRawsOffset);
+    fSSDRawsOffset += 1;
+
+    //Output of the DA
+    TH2D *fHistPSideBadChannelMapLayer5 = new TH2D("SSD/BadChannels/fHistPSideBadChannelMapLayer5",
+                                                  "Layer 5;N_{module};N_{ladder}",
+                                                  22,1,23,
+                                                  34,500,534);
+    fHistPSideBadChannelMapLayer5->GetXaxis()->SetTitleColor(1);
+    fHistPSideBadChannelMapLayer5->SetStats(kFALSE);
+    fHistPSideBadChannelMapLayer5->GetYaxis()->SetTitleOffset(1.8);
+    fHistPSideBadChannelMapLayer5->GetXaxis()->SetNdivisions(22);
+    fHistPSideBadChannelMapLayer5->GetYaxis()->SetNdivisions(34);
+    fHistPSideBadChannelMapLayer5->GetXaxis()->SetLabelSize(0.03);
+    fHistPSideBadChannelMapLayer5->GetYaxis()->SetLabelSize(0.03);
+    fHistPSideBadChannelMapLayer5->GetZaxis()->SetTitleOffset(1.6);
+    fHistPSideBadChannelMapLayer5->GetZaxis()->SetTitle("Bad channels (p-side)[%]");
+    fAliITSQADataMakerRec->Add2RawsList(fHistPSideBadChannelMapLayer5, 
+                                       fGenRawsOffset+fSSDRawsOffset, kTRUE);
+    fSSDRawsOffset += 1; fSSDRawsDAOffset += 1;
+
+    TH2D *fHistNSideBadChannelMapLayer5 = new TH2D("SSD/BadChannels/fHistNSideBadChannelMapLayer5",
+                                                  "Layer 5;N_{module};N_{ladder}",
+                                                  22,1,23,
+                                                  34,500,534);
+    fHistNSideBadChannelMapLayer5->GetXaxis()->SetTitleColor(1);
+    fHistNSideBadChannelMapLayer5->SetStats(kFALSE);
+    fHistNSideBadChannelMapLayer5->GetYaxis()->SetTitleOffset(1.8);
+    fHistNSideBadChannelMapLayer5->GetXaxis()->SetNdivisions(22);
+    fHistNSideBadChannelMapLayer5->GetYaxis()->SetNdivisions(34);
+    fHistNSideBadChannelMapLayer5->GetXaxis()->SetLabelSize(0.03);
+    fHistNSideBadChannelMapLayer5->GetYaxis()->SetLabelSize(0.03);
+    fHistNSideBadChannelMapLayer5->GetZaxis()->SetTitleOffset(1.6);
+    fHistNSideBadChannelMapLayer5->GetZaxis()->SetTitle("Bad channels (n-side)[%]");
+    fAliITSQADataMakerRec->Add2RawsList(fHistNSideBadChannelMapLayer5, 
+                                       fGenRawsOffset+fSSDRawsOffset, kTRUE);
+    fSSDRawsOffset += 1; fSSDRawsDAOffset += 1;
+
+    TH2D *fHistPSideBadChannelMapLayer6 = new TH2D("SSD/BadChannels/fHistPSideBadChannelMapLayer6",
+                                                  "Layer 6;N_{module};N_{ladder}",
+                                                  25,1,26,
+                                                  38,600,638);
+    fHistPSideBadChannelMapLayer6->GetXaxis()->SetTitleColor(1);
+    fHistPSideBadChannelMapLayer6->SetStats(kFALSE);
+    fHistPSideBadChannelMapLayer6->GetYaxis()->SetTitleOffset(1.8);
+    fHistPSideBadChannelMapLayer6->GetXaxis()->SetNdivisions(25);
+    fHistPSideBadChannelMapLayer6->GetYaxis()->SetNdivisions(38);
+    fHistPSideBadChannelMapLayer6->GetXaxis()->SetLabelSize(0.03);
+    fHistPSideBadChannelMapLayer6->GetYaxis()->SetLabelSize(0.03);
+    fHistPSideBadChannelMapLayer6->GetZaxis()->SetTitleOffset(1.6);
+    fHistPSideBadChannelMapLayer6->GetZaxis()->SetTitle("Bad channels (p-side)[%]");
+    fAliITSQADataMakerRec->Add2RawsList(fHistPSideBadChannelMapLayer6, 
+                                       fGenRawsOffset+fSSDRawsOffset, kTRUE);
+    fSSDRawsOffset += 1; fSSDRawsDAOffset += 1;
+
+    TH2D *fHistNSideBadChannelMapLayer6 = new TH2D("SSD/BadChannels/fHistNSideBadChannelMapLayer6",
+                                                  "Layer 6;N_{module};N_{ladder}",
+                                                  25,1,26,
+                                                  38,600,638);
+    fHistNSideBadChannelMapLayer6->GetXaxis()->SetTitleColor(1);
+    fHistNSideBadChannelMapLayer6->SetStats(kFALSE);
+    fHistNSideBadChannelMapLayer6->GetYaxis()->SetTitleOffset(1.8);
+    fHistNSideBadChannelMapLayer6->GetXaxis()->SetNdivisions(25);
+    fHistNSideBadChannelMapLayer6->GetYaxis()->SetNdivisions(38);
+    fHistNSideBadChannelMapLayer6->GetXaxis()->SetLabelSize(0.03);
+    fHistNSideBadChannelMapLayer6->GetYaxis()->SetLabelSize(0.03);
+    fHistNSideBadChannelMapLayer6->GetZaxis()->SetTitleOffset(1.6);
+    fHistNSideBadChannelMapLayer6->GetZaxis()->SetTitle("Bad channels (n-side)[%]");
+    fAliITSQADataMakerRec->Add2RawsList(fHistNSideBadChannelMapLayer6, 
+                                       fGenRawsOffset+fSSDRawsOffset, kTRUE);
+    fSSDRawsOffset += 1; fSSDRawsDAOffset += 1;
   }//online flag
-  AliDebug(1,Form("%d SSD Raws histograms booked\n",fSSDhRaws));
-  AliInfo(Form("Number of histograms (SPD+SDD+SSD): %d\n",fGenOffset+fSSDhRaws));  
+  fSSDhTask = fSSDRawsOffset;
+  AliDebug(1,Form("%d SSD Raws histograms booked\n",fSSDhTask));
+  AliInfo(Form("Number of histograms (SPD+SDD+SSD): %d\n",fGenRawsOffset+fSSDhTask));  
+  AliDebug(1,Form("Number of histograms (SPD+SDD+SSD): %d\n",fGenRawsOffset+fSSDRawsOffset));
 }
 
-
 //____________________________________________________________________________
 void AliITSQASSDDataMakerRec::MakeRaws(AliRawReader* rawReader) { 
   // Fill QA for RAW - SSD -
-  Int_t fStripNumber;
-  Int_t fHistPosition;
-  Int_t fLayer = 0,fLadder = 0, fModule = 0;
+  Int_t gStripNumber;
+  Int_t gHistPosition;
+  Int_t gLayer = 0,gLadder = 0, gModule = 0;
   
-  Double_t fSizePerDDL[fgkNumOfDDLs] = {0.,0.,0.,0.,0.,0.,0.,0.,0.,0.,0.,0.,0.,0.,0.,0.};
-  Double_t fSizePerLDC[fgkNumOfLDCs] = {0.,0.,0.};
+  Double_t gSizePerDDL[fgkNumOfDDLs] = {0.,0.,0.,0.,0.,0.,0.,0.,0.,0.,0.,0.,0.,0.,0.,0.};
+  Double_t gSizePerLDC[fgkNumOfLDCs] = {0.,0.,0.};
   Double_t sumSSDDataSize = 0.0;
   Double_t eventSize = -1.0;
 
   if(fkOnline) {
     //reset the signal vs strip number histograms
-    for(Int_t i = 0; i < fgkSSDMODULES; i++) 
-      fHistSSDRawSignalModule[i]->Reset();
-  }
+    for(Int_t iModule = 0; iModule < fgkSSDMODULES; iModule++)
+      fHistSSDRawSignalModule[iModule]->Reset();
+  }//online flag
+
   rawReader->Select("ITSSSD",-1,-1);  
   rawReader->Reset(); //rawReader->NextEvent();   
-  (fAliITSQADataMakerRec->GetRawsData(fGenOffset))->Fill(rawReader->GetType());
-  if(rawReader->GetType() == 7)
+  (fAliITSQADataMakerRec->GetRawsData(fGenRawsOffset))->Fill(rawReader->GetType());
+  if(rawReader->GetType() == 7) {
     fSSDEvent += 1;
-  
-  AliITSRawStreamSSD fSSDStream(rawReader);    
+    fSSDEventPerCycle += 1;
+  }
+
+  AliITSRawStreamSSD gSSDStream(rawReader);    
   AliRawReaderRoot *rootReader = (AliRawReaderRoot *)rawReader;
   if(rootReader) {
     const AliRawEventHeaderBase *header = rootReader->GetEventHeader();
     if(header)
       eventSize = header->GetEventSize();
   }
-  while (fSSDStream.Next()) {
-    if(fSSDStream.GetModuleID() < 0) continue;
-    fSizePerDDL[rawReader->GetDDLID()] = rawReader->GetDataSize();
-    fSizePerLDC[rawReader->GetLDCId()-6] = rawReader->GetDataSize();
-    AliITSgeomTGeo::GetModuleId(fSSDStream.GetModuleID(),fLayer,fLadder,fModule);
-    fStripNumber = (fSSDStream.GetSideFlag() == 0) ? fSSDStream.GetStrip() : fSSDStream.GetStrip() + fgkNumberOfPSideStrips;
-    fHistPosition = (fLayer == 5) ? ((fLadder - 1)*fgkSSDMODULESPERLADDERLAYER5 + fModule - 1) : ((fLadder - 1)*fgkSSDMODULESPERLADDERLAYER6 + fModule + fgkSSDMODULESLAYER5 - 1);
-    //AliInfo(Form("ModulePosition: %d - Layer: %d - Ladder: %d - Module: %d\n",fHistPosition,fLayer,fLadder,fModule));
+  while (gSSDStream.Next()) {
+    if(gSSDStream.GetModuleID() < 0) continue;
+    /*cout<<"DDL: "<<rawReader->GetDDLID()<<
+      " - LDC: "<<rawReader->GetLDCId()<<
+      " - Size: "<<rawReader->GetDataSize()<<
+      " - Equipment size: "<<rawReader->GetEquipmentSize()<<endl;*/
+    gSizePerDDL[rawReader->GetDDLID()] = rawReader->GetDataSize();
+    gSizePerLDC[rawReader->GetLDCId()-6] = rawReader->GetDataSize();
+    AliITSgeomTGeo::GetModuleId(gSSDStream.GetModuleID(),gLayer,gLadder,gModule);
+    if(gSSDStream.GetStrip() < 0) continue;
+    gStripNumber = (gSSDStream.GetSideFlag() == 0) ? gSSDStream.GetStrip() : -gSSDStream.GetStrip() + 2*fgkNumberOfPSideStrips;
+    gHistPosition = (gLayer == 5) ? ((gLadder - 1)*fgkSSDMODULESPERLADDERLAYER5 + gModule - 1) : ((gLadder - 1)*fgkSSDMODULESPERLADDERLAYER6 + gModule + fgkSSDMODULESLAYER5 - 1);
+    //AliInfo(Form("ModulePosition: %d - Layer: %d - Ladder: %d - Module: %d\n",gHistPosition,gLayer,gLadder,gModule));
     if(fkOnline)
-      fHistSSDRawSignalModule[fHistPosition]->Fill(fStripNumber,fSSDStream.GetSignal());
+      fHistSSDRawSignalModule[gHistPosition]->Fill(gStripNumber,gSSDStream.GetSignal());
+    //fAliITSQADataMakerRec->GetRawsData(fGenRawsOffset+gHistPosition+fSSDRawsCommonLevelOffset)->Fill(gStripNumber,gSSDStream.GetSignal());
   }//streamer loop   
   
-  
+  //event size calculation and filling info
   for(Int_t i = 0; i < fgkNumOfDDLs; i++) {
-    sumSSDDataSize += fSizePerDDL[i];
-    if(fSizePerDDL[i] > 0) {
-      (fAliITSQADataMakerRec->GetRawsData(fGenOffset+3))->Fill(i+512);
-      (fAliITSQADataMakerRec->GetRawsData(fGenOffset+5+i))->Fill(TMath::Log10(fSizePerDDL[i]));
+    sumSSDDataSize += gSizePerDDL[i];
+    if(gSizePerDDL[i] > 0) {
+      (fAliITSQADataMakerRec->GetRawsData(fGenRawsOffset+3))->Fill(i+512);
+      (fAliITSQADataMakerRec->GetRawsData(fGenRawsOffset+5+i))->Fill(TMath::Log10(gSizePerDDL[i]));
     }
-    (fAliITSQADataMakerRec->GetRawsData(fGenOffset+4))->Fill(i+512,fSizePerDDL[i]/1e+06);
+    //(fAliITSQADataMakerRec->GetRawsData(fGenRawsOffset+4))->Fill(i+512,gSizePerDDL[i]/1e+06);
   }
   for(Int_t i = 0; i < fgkNumOfLDCs; i++) {
-    if(fSizePerLDC[i] > 0) {
-      (fAliITSQADataMakerRec->GetRawsData(fGenOffset+21))->Fill(i+6);
-      (fAliITSQADataMakerRec->GetRawsData(fGenOffset+23+i))->Fill(TMath::Log10(fSizePerLDC[i]));
+    if(gSizePerLDC[i] > 0) {
+      (fAliITSQADataMakerRec->GetRawsData(fGenRawsOffset+21))->Fill(i+6);
+      //LDC 082
+      if(i == 0)
+       gSizePerLDC[i] = gSizePerDDL[8] + gSizePerDDL[9] + gSizePerDDL[10] +
+         gSizePerDDL[11] + gSizePerDDL[12] + gSizePerDDL[13];
+      //LDC 086
+      if(i == 1)
+       gSizePerLDC[i] = gSizePerDDL[3] + gSizePerDDL[4] + gSizePerDDL[5] +
+         gSizePerDDL[6] + gSizePerDDL[7];
+      //LDC 085
+      if(i == 2)
+       gSizePerLDC[i] = gSizePerDDL[0] + gSizePerDDL[1] + gSizePerDDL[2] +
+         gSizePerDDL[14] + gSizePerDDL[15];
+      (fAliITSQADataMakerRec->GetRawsData(fGenRawsOffset+23+i))->Fill(TMath::Log10(gSizePerLDC[i]));
+      //cout<<"Event: "<<fSSDEventPerCycle<<" - LDC: "<<i+6<<
+      //" - Data size: "<<gSizePerLDC[i]<<endl;
     }
-    (fAliITSQADataMakerRec->GetRawsData(fGenOffset+22))->Fill(i+6,fSizePerLDC[i]/1e+06);
+    //(fAliITSQADataMakerRec->GetRawsData(fGenRawsOffset+22))->Fill(i+6,gSizePerLDC[i]/1e+06);
   }
   if(sumSSDDataSize) 
-    (fAliITSQADataMakerRec->GetRawsData(fGenOffset+1))->Fill(TMath::Log10(sumSSDDataSize));
+    (fAliITSQADataMakerRec->GetRawsData(fGenRawsOffset+1))->Fill(TMath::Log10(sumSSDDataSize));
   if(eventSize)
-    (fAliITSQADataMakerRec->GetRawsData(fGenOffset+2))->Fill(100.*sumSSDDataSize/eventSize);
+    (fAliITSQADataMakerRec->GetRawsData(fGenRawsOffset+2))->Fill(100.*sumSSDDataSize/eventSize);
+
+  //Occupancy calculation
   if(fkOnline) {
-    //AliInfo(Form("EVENT: %d\n",fSSDEvent));
-    Double_t occupancy = 0.0;
-    Int_t lLadderLocationY = 0;    
-    Int_t fOccPosition = 0;
-    for(Int_t i = 0; i < fgkSSDMODULES; i++) {
-      AliITSgeomTGeo::GetModuleId(i+500,fLayer,fLadder,fModule); 
-      fOccPosition  = (fLayer == 5) ? fLadder : fLadder + fgkSSDLADDERSLAYER5;
-      //P-SIDE OCCUPANCY
-      occupancy = GetSSDOccupancyRaws(fHistSSDRawSignalModule[i],0);
-      fAliITSQADataMakerRec->GetRawsData(fGenOffset + fSSDRawsOffset - 1 + 2*fOccPosition - 1)->Fill(fModule,occupancy);
-      lLadderLocationY = 3*fLadder; // sideP=1 sideN=0
-      if(fLayer == 5)
-       ((TH2D *)fAliITSQADataMakerRec->GetRawsData(fGenOffset+28))->SetBinContent(fModule,lLadderLocationY,occupancy);
-      else if(fLayer == 6)
-       ((TH2D *)fAliITSQADataMakerRec->GetRawsData(fGenOffset+29))->SetBinContent(fModule,lLadderLocationY,occupancy);
-      //N-SIDE OCCUPANCY
-      occupancy = GetSSDOccupancyRaws(fHistSSDRawSignalModule[i],1);
-      fAliITSQADataMakerRec->GetRawsData(fGenOffset + fSSDRawsOffset - 1 + 2*fOccPosition)->Fill(fModule,occupancy);
-      if(fLayer == 5)
-       ((TH2D *)fAliITSQADataMakerRec->GetRawsData(fGenOffset+28))->SetBinContent(fModule,lLadderLocationY-1,occupancy);
-      else if(fLayer == 6)
-       ((TH2D *)fAliITSQADataMakerRec->GetRawsData(fGenOffset+29))->SetBinContent(fModule,lLadderLocationY-1,occupancy);
-    }
+    for(Int_t iModule = 0; iModule < fgkSSDMODULES; iModule++) {
+      GetOccupancyStrip(fHistSSDRawSignalModule[iModule],fOccupancyMatrix[iModule]);
+      //if(iModule == 156) {    
+       //cout<<"========================================"<<endl;
+       //AliITSgeomTGeo::GetModuleId(656,gLayer,gLadder,gModule);
+       /*for(Int_t iBin = 1; iBin < fHistSSDRawSignalModule[iModule]->GetXaxis()->GetNbins(); iBin++) {
+         if((iBin >= 750)&&(iBin <= 780))
+         cout<<"Event: "<<fSSDEventPerCycle<<" - Ladder: "<<gLadder+499<<
+         " - Module: "<<gModule<<" - Strip: "<<iBin<<
+         " - Signal: "<<fHistSSDRawSignalModule[iModule]->GetBinContent(iBin)<<endl;
+         }*///strip loop --> to be removed
+      //}//module cut --> to be removed
+    }//module loop
   }//online flag for SSD
 }
 
+//____________________________________________________________________________ //
+void AliITSQASSDDataMakerRec::GetOccupancyStrip(TH1 *lHisto, Int_t *occupancyMatrix) { 
+  //Increments the entries in the occupancy matrix based 
+  //on whether the signal for each strip is larger than the cutoff
+  //Currently the cutoff is at 0 which means that if ZS
+  //works, whatever comes from the FEROM is considered as "signal"
+  //Double_t cutoff = 0.0;
+  TString histname = lHisto->GetName();
+  //cout<<histname.Data()<<endl;
+  //if(histname.Contains("Layer5_Ladder8_Module3")) {
+  for(Int_t iBin = 1; iBin < lHisto->GetXaxis()->GetNbins(); iBin++) {
+    Double_t y = lHisto->GetBinContent(iBin);
+    if(y) {
+      occupancyMatrix[iBin-1] += 1;
+    }
+    //if((iBin >= 750)&&(iBin <= 780))
+    //cout<<"Strip: "<<iBin<<
+    //" - Signal: "<<y<<
+    //" - Occupancy: "<<occupancyMatrix[iBin-1]<<endl;
+    
+  }
+  //}
+}
+
 //____________________________________________________________________________ 
-Double_t AliITSQASSDDataMakerRec::GetSSDOccupancyRaws(TH1 *lHisto, Int_t stripside) { 
+Double_t AliITSQASSDDataMakerRec::GetOccupancyModule(TH1 *lHisto, 
+                                                    Int_t stripside,
+                                                    Int_t mode,
+                                                    Double_t threshold) {
+  //Mode 0: calculates the occupancy of a module 
+  //        without a threshold in the strip occupancy
+  //Mode 1: calculates the occupancy of a module 
+  //        with the set threshold in the strip occupancy
+  //Mode 2: calculates the average occupancy of a module 
+
   // bo: TDC >0 or # of sigmas wrt noise ?
   //stripside == 0 --> P-side
   //stripside == 1 --> N-side
   Int_t lNumFiredBins = 0;
+  Double_t sumOccupancy = 0.0;
+  TString histname = lHisto->GetName();
   for(Int_t iBin = 1 + stripside*fgkNumberOfPSideStrips; iBin < fgkNumberOfPSideStrips*(1 + stripside); iBin++){
-    if (lHisto->GetBinContent(iBin) > 0)
+    /*if(histname.Contains("Layer5_Ladder507_Module3")) {
+      cout<<lHisto->GetName()<<
+      " - Strip: "<<iBin<<
+      " - Bin content: "<<lHisto->GetBinContent(iBin)<<endl;
+      }*/
+    if (lHisto->GetBinContent(iBin) > threshold) {
       lNumFiredBins++; 
+      sumOccupancy = lHisto->GetBinContent(iBin);
+    }
   }
   
-  Double_t lOccupancy = (100.*lNumFiredBins)/fgkNumberOfPSideStrips; // percentage
+  Double_t lOccupancy = 0.0;
+  if((mode == 0)||(mode == 1))
+    lOccupancy = (100.*lNumFiredBins)/fgkNumberOfPSideStrips; // percentage  
+  else if(mode == 2)
+    lOccupancy = 100.*sumOccupancy/fgkNumberOfPSideStrips;
+
+  /*if(histname.Contains("Layer5_Ladder507_Module3"))
+    cout<<"Fired strips: "<<lNumFiredBins<<
+    " - Occupancy: "<<lOccupancy<<endl;*/
   //AliInfo(Form("Fired strips: %d - Total strips: %d - Occupancy :%lf\n",lNumFiredBins,lHisto->GetNbinsX(),lOccupancy));
   
   return lOccupancy;
 }
 
+//____________________________________________________________________________
+void AliITSQASSDDataMakerRec::MonitorOCDBObjects() { 
+  //Monitor in AMORE the output of the DA
+  //Currently only the bad channel list is monitored
+  //Todo: Noise - Pedestal
+  ((TH2D *)fAliITSQADataMakerRec->GetRawsData(fGenRawsOffset+fSSDRawsOffset-fSSDRawsDAOffset))->Reset();
+  ((TH2D *)fAliITSQADataMakerRec->GetRawsData(fGenRawsOffset+fSSDRawsOffset-fSSDRawsDAOffset+1))->Reset();
+  ((TH2D *)fAliITSQADataMakerRec->GetRawsData(fGenRawsOffset+fSSDRawsOffset-fSSDRawsDAOffset+2))->Reset();
+  ((TH2D *)fAliITSQADataMakerRec->GetRawsData(fGenRawsOffset+fSSDRawsOffset-fSSDRawsDAOffset+3))->Reset();
+
+  AliCDBEntry *entryBadChannelsSSD = fCDBManager->Get("ITS/Calib/BadChannelsSSD");
+  if(!entryBadChannelsSSD) 
+    AliError("OCDB entry for the bad channel list is not valid!"); 
+  AliITSBadChannelsSSDv2 *badchannelsSSD = (AliITSBadChannelsSSDv2 *)entryBadChannelsSSD->GetObject();
+  if(!badchannelsSSD)
+    AliError("Bad channel list object is not a valid AliITSBadChannelsSSD object!");
+
+  //_____________________________________________________________________________//                       
+  Int_t nBadPSideChannels = 0, nBadNSideChannels = 0;
+  Int_t layer = 0, ladder = 0, module = 0;
+  Int_t nPSideChannelsLayer5 = 0, nNSideChannelsLayer5 = 0;
+  Int_t nPSideChannelsLayer6 = 0, nNSideChannelsLayer6 = 0;
+  //_____________________________________________________________________________//                      
+
+  for(Int_t i = 0; i < fgkSSDMODULES; i++) {
+    AliITSgeomTGeo::GetModuleId(i+500,layer,ladder,module);
+    nBadPSideChannels = 0, nBadNSideChannels = 0;
+    nPSideChannelsLayer5 = 0, nNSideChannelsLayer5 = 0;
+    nPSideChannelsLayer6 = 0, nNSideChannelsLayer6 = 0;
+
+    Int_t badChannel = 0;
+    for(Int_t j = 0; j < fgkNumberOfPSideStrips; j++) {
+      badChannel = (Int_t)(badchannelsSSD->GetBadChannelP(i,j));
+      if(badChannel != 0) {
+        if(layer == 5)
+          nPSideChannelsLayer5 += 1;
+        if(layer == 6)
+          nPSideChannelsLayer6 += 1;
+        nBadPSideChannels += 1;
+      }//badchannel flag != 0
+      badChannel = (Int_t)(badchannelsSSD->GetBadChannelN(i,j));
+      if(badChannel != 0) {
+        if(layer == 5)
+          nNSideChannelsLayer5 += 1;
+        if(layer == 6)
+          nNSideChannelsLayer6 += 1;
+        nBadNSideChannels += 1;
+      }//badchannel flag != 0
+    }//loop over strips
+    if(layer == 5) {
+      if(nPSideChannelsLayer5 > 0)
+       ((TH2D *)fAliITSQADataMakerRec->GetRawsData(fGenRawsOffset+fSSDRawsOffset-fSSDRawsDAOffset))->Fill(module,499+ladder,
+                                                                           100.*nPSideChannelsLayer5/fgkNumberOfPSideStrips);
+      else ((TH2D *)fAliITSQADataMakerRec->GetRawsData(fGenRawsOffset+fSSDRawsOffset-fSSDRawsDAOffset))->Fill(module,499+ladder,0.0001);
+      if(nNSideChannelsLayer5 > 0)
+       ((TH2D *)fAliITSQADataMakerRec->GetRawsData(fGenRawsOffset+fSSDRawsOffset-fSSDRawsDAOffset+1))->Fill(module,499+ladder,
+                                                                           100.*nNSideChannelsLayer5/fgkNumberOfPSideStrips);
+      else ((TH2D *)fAliITSQADataMakerRec->GetRawsData(fGenRawsOffset+fSSDRawsOffset-fSSDRawsDAOffset+1))->Fill(module,499+ladder,0.0001);
+    }//layer 5                                                                                                                      
+    if(layer == 6) {
+      if(nPSideChannelsLayer6 > 0)
+        ((TH2D *)fAliITSQADataMakerRec->GetRawsData(fGenRawsOffset+fSSDRawsOffset-fSSDRawsDAOffset+2))->Fill(module,599+ladder,
+                                                                           100.*nPSideChannelsLayer6/fgkNumberOfPSideStrips);
+      else ((TH2D *)fAliITSQADataMakerRec->GetRawsData(fGenRawsOffset+fSSDRawsOffset-fSSDRawsDAOffset+2))->Fill(module,599+ladder,0.0001);
+      if(nNSideChannelsLayer6 > 0)
+        ((TH2D *)fAliITSQADataMakerRec->GetRawsData(fGenRawsOffset+fSSDRawsOffset-fSSDRawsDAOffset+3))->Fill(module,599+ladder,
+                                                                           100.*nNSideChannelsLayer6/fgkNumberOfPSideStrips);
+      else ((TH2D *)fAliITSQADataMakerRec->GetRawsData(fGenRawsOffset+fSSDRawsOffset-fSSDRawsDAOffset+3))->Fill(module,599+ladder,0.0001);
+    }//layer 6                                                                                                                      
+  }//module loop
+}
 
 //____________________________________________________________________________ 
 void AliITSQASSDDataMakerRec::InitRecPoints()
 {
   // Initialization for RECPOINTS - SSD -
   fGenOffset = (fAliITSQADataMakerRec->fRecPointsQAList)->GetEntries();
+  fGenRecPointsOffset = (fAliITSQADataMakerRec->fRecPointsQAList)->GetEntries();
   Int_t nModuleOffset = 500;
   Int_t nITSTotalModules = AliITSgeomTGeo::GetNModules();
 
-  TH1F *fHistSSDModuleIdLayer5 = new TH1F("fHistSSDModuleIdLayer5",
-                                         "Module Id - Layer 5;Module Id;Entries",
-                                         fgkSSDMODULESLAYER5,
-                                         nModuleOffset - 0.5,
-                                         nITSTotalModules-fgkSSDMODULESLAYER6+0.5);
+  TH1F *fHistSSDModuleIdLayer5 = new TH1F("SSD/Statistics/fHistSSDModuleIdLayer5",
+                                      "Module Id - Layer 5;Module Id;Entries",
+                                      fgkSSDMODULESLAYER5,
+                                      nModuleOffset - 0.5,
+                                      nITSTotalModules-fgkSSDMODULESLAYER6+0.5);
   fAliITSQADataMakerRec->Add2RecPointsList(fHistSSDModuleIdLayer5, 
-                                          fGenOffset + fSSDhRecs);
-  fSSDhRecs += 1;
-  TH1F *fHistSSDModuleIdLayer6 = new TH1F("fHistSSDModuleIdLayer6",
-                                         "Module Id - Layer 6;Module Id;Entries",
-                                         fgkSSDMODULESLAYER6,
-                                         nModuleOffset+fgkSSDMODULESLAYER5 - 0.5,
-                                         nITSTotalModules + 0.5);
+                                          fGenRecPointsOffset + 0, kTRUE);
+  fSSDhTask += 1;
+  TH1F *fHistSSDModuleIdLayer6 = new TH1F("SSD/Statistics/fHistSSDModuleIdLayer6",
+                                      "Module Id - Layer 6;Module Id;Entries",
+                                      fgkSSDMODULESLAYER6,
+                                      nModuleOffset+fgkSSDMODULESLAYER5 - 0.5,
+                                      nITSTotalModules + 0.5);
   fAliITSQADataMakerRec->Add2RecPointsList(fHistSSDModuleIdLayer6, 
-                                          fGenOffset + fSSDhRecs);
-  fSSDhRecs += 1;
-  TH1F *fHistSSDLocalXLayer5 = new TH1F("fHistSSDLocalXLayer5",
-                                       "Local x coord.- Layer 5;x [cm];Entries;",
-                                       100,-4.,4.);
+                                          fGenRecPointsOffset + 1, kTRUE);
+  fSSDhTask += 1;
+  TH1F *fHistSSDClusterPerEventLayer5 = new TH1F("SSD/Statistics/fHistSSDClusterPerEventLayer5",
+                                             "N_{clusters} - Layer 5;N_{clusters};Entries;",
+                                             100,0.1,5000);
+  fAliITSQADataMakerRec->Add2RecPointsList(fHistSSDClusterPerEventLayer5,
+                                          fGenRecPointsOffset + 2, kTRUE);
+  fSSDhTask += 1;
+  TH1F *fHistSSDClusterPerEventLayer6 = new TH1F("SSD/Statistics/fHistSSDClusterPerEventLayer6",
+                                             "N_{clusters} - Layer 6;N_{clusters};Entries;",
+                                             100,0.1,5000);
+  fAliITSQADataMakerRec->Add2RecPointsList(fHistSSDClusterPerEventLayer6,
+                                          fGenRecPointsOffset + 3, kTRUE);
+  fSSDhTask += 1;
+  TH1F *fHistSSDLocalXLayer5 = new TH1F("SSD/Coordinates/fHistSSDLocalXLayer5",
+                                    "Local x coord.- Layer 5;x [cm];Entries;",
+                                    100,-4.,4.);
   fAliITSQADataMakerRec->Add2RecPointsList(fHistSSDLocalXLayer5,
-                                          fGenOffset + fSSDhRecs);
-  fSSDhRecs += 1;
-  TH1F *fHistSSDLocalXLayer6 = new TH1F("fHistSSDLocalXLayer6",
-                                       "Local x coord.- Layer 6;x [cm];Entries;",
-                                       100,-4.,4.);
+                                          fGenRecPointsOffset + 4, kTRUE);
+  fSSDhTask += 1;
+  TH1F *fHistSSDLocalXLayer6 = new TH1F("SSD/Coordinates/fHistSSDLocalXLayer6",
+                                    "Local x coord.- Layer 6;x [cm];Entries;",
+                                    100,-4.,4.);
   fAliITSQADataMakerRec->Add2RecPointsList(fHistSSDLocalXLayer6, 
-                                          fGenOffset + fSSDhRecs);
-  fSSDhRecs += 1;
-  TH1F *fHistSSDLocalZLayer5 = new TH1F("fHistSSDLocalZLayer5",
-                                       "Local z coord.- Layer 5;z [cm];Entries;",
-                                       100,-4.,4.);
+                                          fGenRecPointsOffset + 5, kTRUE);
+  fSSDhTask += 1;
+  TH1F *fHistSSDLocalZLayer5 = new TH1F("SSD/Coordinates/fHistSSDLocalZLayer5",
+                                    "Local z coord.- Layer 5;z [cm];Entries;",
+                                    100,-4.,4.);
   fAliITSQADataMakerRec->Add2RecPointsList(fHistSSDLocalZLayer5, 
-                                          fGenOffset + fSSDhRecs);
-  fSSDhRecs += 1;
-  TH1F *fHistSSDLocalZLayer6 = new TH1F("fHistSSDLocalZLayer6",
-                                       "Local z coord.- Layer 6;z [cm];Entries;",
-                                       100,-4.,4.);
+                                          fGenRecPointsOffset + 6, kTRUE);
+  fSSDhTask += 1;
+  TH1F *fHistSSDLocalZLayer6 = new TH1F("SSD/Coordinates/fHistSSDLocalZLayer6",
+                                    "Local z coord.- Layer 6;z [cm];Entries;",
+                                    100,-4.,4.);
   fAliITSQADataMakerRec->Add2RecPointsList(fHistSSDLocalZLayer6, 
-                                          fGenOffset + fSSDhRecs);
-  fSSDhRecs += 1;
-  TH1F *fHistSSDGlobalXLayer5 = new TH1F("fHistSSDGlobalXLayer5",
-                                        "Global x - Layer 5;x [cm];Entries;",
-                                        100,-40.,40.);
+                                          fGenRecPointsOffset + 7, kTRUE);
+  fSSDhTask += 1;
+  TH1F *fHistSSDGlobalXLayer5 = new TH1F("SSD/Coordinates/fHistSSDGlobalXLayer5",
+                                     "Global x - Layer 5;x [cm];Entries;",
+                                     100,-40.,40.);
   fAliITSQADataMakerRec->Add2RecPointsList(fHistSSDGlobalXLayer5, 
-                                          fGenOffset + fSSDhRecs);
-  fSSDhRecs += 1;
-  TH1F *fHistSSDGlobalXLayer6 = new TH1F("fHistSSDGlobalXLayer6",
-                                        "Global x - Layer 6;x [cm];Entries;",
-                                        100,-45.,45.);
+                                          fGenRecPointsOffset + 8, kTRUE);
+  fSSDhTask += 1;
+  TH1F *fHistSSDGlobalXLayer6 = new TH1F("SSD/Coordinates/fHistSSDGlobalXLayer6",
+                                     "Global x - Layer 6;x [cm];Entries;",
+                                     100,-45.,45.);
   fAliITSQADataMakerRec->Add2RecPointsList(fHistSSDGlobalXLayer6, 
-                                          fGenOffset + fSSDhRecs);
-  fSSDhRecs += 1;
-  TH1F *fHistSSDGlobalYLayer5 = new TH1F("fHistSSDGlobalYLayer5",
-                                        "Global y - Layer 5;y [cm];Entries;",
-                                        100,-40.,40);
+                                          fGenRecPointsOffset + 9, kTRUE);
+  fSSDhTask += 1;
+  TH1F *fHistSSDGlobalYLayer5 = new TH1F("SSD/Coordinates/fHistSSDGlobalYLayer5",
+                                     "Global y - Layer 5;y [cm];Entries;",
+                                     100,-40.,40);
   fAliITSQADataMakerRec->Add2RecPointsList(fHistSSDGlobalYLayer5, 
-                                          fGenOffset + fSSDhRecs);
-  fSSDhRecs += 1;
-  TH1F *fHistSSDGlobalYLayer6 = new TH1F("fHistSSDGlobalYLayer6",
-                                        "Global y - Layer 6;y [cm];Entries;",
-                                        100,-45.,45.);
+                                          fGenRecPointsOffset + 10, kTRUE);
+  fSSDhTask += 1;
+  TH1F *fHistSSDGlobalYLayer6 = new TH1F("SSD/Coordinates/fHistSSDGlobalYLayer6",
+                                     "Global y - Layer 6;y [cm];Entries;",
+                                     100,-45.,45.);
   fAliITSQADataMakerRec->Add2RecPointsList(fHistSSDGlobalYLayer6, 
-                                          fGenOffset + fSSDhRecs);
-  fSSDhRecs += 1;
-  TH1F *fHistSSDGlobalZLayer5 = new TH1F("fHistSSDGlobalZLayer5",
-                                        "Global z - Layer 5;z [cm];Entries;",
-                                        100,-45.,45);
+                                          fGenRecPointsOffset + 11, kTRUE);
+  fSSDhTask += 1;
+  TH1F *fHistSSDGlobalZLayer5 = new TH1F("SSD/Coordinates/fHistSSDGlobalZLayer5",
+                                     "Global z - Layer 5;z [cm];Entries;",
+                                     100,-45.,45);
   fAliITSQADataMakerRec->Add2RecPointsList(fHistSSDGlobalZLayer5, 
-                                          fGenOffset + fSSDhRecs);
-  fSSDhRecs += 1;
-  TH1F *fHistSSDGlobalZLayer6 = new TH1F("fHistSSDGlobalZLayer6",
-                                        "Global z - Layer 6;z [cm];Entries;",
-                                        100,-55.,55.);
+                                          fGenRecPointsOffset + 12, kTRUE);
+  fSSDhTask += 1;
+  TH1F *fHistSSDGlobalZLayer6 = new TH1F("SSD/Coordinates/fHistSSDGlobalZLayer6",
+                                     "Global z - Layer 6;z [cm];Entries;",
+                                     100,-55.,55.);
   fAliITSQADataMakerRec->Add2RecPointsList(fHistSSDGlobalZLayer6, 
-                                          fGenOffset + fSSDhRecs);
-  fSSDhRecs += 1;
-  TH1F *fHistSSDPhiLayer5 = new TH1F("fHistSSDPhiLayer5",
-                                    "#phi - Layer 5;#phi [rad];Entries;",
-                                    100,-TMath::Pi(),TMath::Pi());
+                                          fGenRecPointsOffset + 13, kTRUE);
+  fSSDhTask += 1;
+  TH1F *fHistSSDPhiLayer5 = new TH1F("SSD/Coordinates/fHistSSDPhiLayer5",
+                                 "#phi - Layer 5;#phi [rad];Entries;",
+                                 100,-TMath::Pi(),TMath::Pi());
   fAliITSQADataMakerRec->Add2RecPointsList(fHistSSDPhiLayer5, 
-                                          fGenOffset + fSSDhRecs);
-  fSSDhRecs += 1;
-  TH1F *fHistSSDPhiLayer6 = new TH1F("fHistSSDPhiLayer6",
-                                    "#phi - Layer 6;#phi [rad];Entries;",
-                                    100,-TMath::Pi(),TMath::Pi());
+                                          fGenRecPointsOffset + 14, kTRUE);
+  fSSDhTask += 1;
+  TH1F *fHistSSDPhiLayer6 = new TH1F("SSD/Coordinates/fHistSSDPhiLayer6",
+                                 "#phi - Layer 6;#phi [rad];Entries;",
+                                 100,-TMath::Pi(),TMath::Pi());
   fAliITSQADataMakerRec->Add2RecPointsList(fHistSSDPhiLayer6, 
-                                          fGenOffset + fSSDhRecs);
-  fSSDhRecs += 1;
-  TH1F *fHistSSDThetaLayer5 = new TH1F("fHistSSDThetaLayer5",
-                                      "#theta - Layer 5;#theta [rad];Entries;",
-                                      100,-TMath::Pi(),TMath::Pi());
+                                          fGenRecPointsOffset + 15, kTRUE);
+  fSSDhTask += 1;
+  TH1F *fHistSSDThetaLayer5 = new TH1F("SSD/Coordinates/fHistSSDThetaLayer5",
+                                   "#theta - Layer 5;#theta [rad];Entries;",
+                                   100,-TMath::Pi(),TMath::Pi());
   fAliITSQADataMakerRec->Add2RecPointsList(fHistSSDThetaLayer5, 
-                                          fGenOffset + fSSDhRecs);
-  fSSDhRecs += 1;
-  TH1F *fHistSSDThetaLayer6 = new TH1F("fHistSSDThetaLayer6",
-                                      "#theta - Layer 6;#theta [rad];Entries;",
-                                      100,-TMath::Pi(),TMath::Pi());
+                                          fGenRecPointsOffset + 16, kTRUE);
+  fSSDhTask += 1;
+  TH1F *fHistSSDThetaLayer6 = new TH1F("SSD/Coordinates/fHistSSDThetaLayer6",
+                                   "#theta - Layer 6;#theta [rad];Entries;",
+                                   100,-TMath::Pi(),TMath::Pi());
   fAliITSQADataMakerRec->Add2RecPointsList(fHistSSDThetaLayer6, 
-                                          fGenOffset + fSSDhRecs);
-  fSSDhRecs += 1;
-  TH1F *fHistSSDRadiusLayer5 = new TH1F("fHistSSDRadiusLayer5",
-                                       "r - Layer 5;r [cm];Entries;",
-                                       100,35.,50.);
+                                          fGenRecPointsOffset + 17, kTRUE);
+  fSSDhTask += 1;
+  TH1F *fHistSSDRadiusLayer5 = new TH1F("SSD/Coordinates/fHistSSDRadiusLayer5",
+                                    "r - Layer 5;r [cm];Entries;",
+                                    100,35.,50.);
   fAliITSQADataMakerRec->Add2RecPointsList(fHistSSDRadiusLayer5, 
-                                          fGenOffset + fSSDhRecs);
-  fSSDhRecs += 1;
-  TH1F *fHistSSDRadiusLayer6 = new TH1F("fHistSSDRadiusLayer6",
-                                       "r - Layer 6;r [cm];Entries;",
-                                       100,35.,50.);
+                                          fGenRecPointsOffset + 18, kTRUE);
+  fSSDhTask += 1;
+  TH1F *fHistSSDRadiusLayer6 = new TH1F("SSD/Coordinates/fHistSSDRadiusLayer6",
+                                    "r - Layer 6;r [cm];Entries;",
+                                    100,35.,50.);
   fAliITSQADataMakerRec->Add2RecPointsList(fHistSSDRadiusLayer6, 
-                                          fGenOffset + fSSDhRecs);
-  fSSDhRecs += 1;
-  TH1F *fHistSSDClusterTypeLayer5 = new TH1F("fHistSSDClusterTypeLayer5",
-                                            "CL type - Layer 5;Cluster type;Entries;",
-                                            150,0,150);
+                                          fGenRecPointsOffset + 19, kTRUE);
+  fSSDhTask += 1;
+  TH1F *fHistSSDClusterTypeLayer5 = new TH1F("SSD/ClusterCharge/Layer5/fHistSSDClusterTypeLayer5",
+                                         "CL type - Layer 5;Cluster type;Entries;",
+                                         150,0,150);
   fAliITSQADataMakerRec->Add2RecPointsList(fHistSSDClusterTypeLayer5, 
-                                          fGenOffset + fSSDhRecs);
-  fSSDhRecs += 1;
-  TH1F *fHistSSDClusterTypeLayer6 = new TH1F("fHistSSDClusterTypeLayer6",
-                                            "CL type - Layer 6;Cluster type;Entries;",
-                                            150,0,150);
+                                          fGenRecPointsOffset + 20, kTRUE);
+  fSSDhTask += 1;
+  TH1F *fHistSSDClusterTypeLayer6 = new TH1F("SSD/ClusterCharge/Layer6/fHistSSDClusterTypeLayer6",
+                                         "CL type - Layer 6;Cluster type;Entries;",
+                                         150,0,150);
   fAliITSQADataMakerRec->Add2RecPointsList(fHistSSDClusterTypeLayer6, 
-                                          fGenOffset + fSSDhRecs);
-  fSSDhRecs += 1;
-  TH1F *fHistSSDChargeRatioLayer5 = new TH1F("fHistSSDChargeRatioLayer5",
-                                            "Charge ratio - Layer 5;q_{ratio};Entries;",
-                                            100,-2.0,2.0);
+                                          fGenRecPointsOffset + 21, kTRUE);
+  fSSDhTask += 1;
+  TH1F *fHistSSDChargeRatioLayer5 = new TH1F("SSD/ClusterCharge/Layer5/fHistSSDChargeRatioLayer5",
+                                         "Charge ratio - Layer 5;q_{ratio};Entries;",
+                                         100,-2.0,2.0);
   fAliITSQADataMakerRec->Add2RecPointsList(fHistSSDChargeRatioLayer5, 
-                                          fGenOffset + fSSDhRecs);
-  fSSDhRecs += 1;
-  TH1F *fHistSSDChargeRatioLayer6 = new TH1F("fHistSSDChargeRatioLayer6",
-                                            "Charge ratio - Layer 6;q_{ratio};Entries;",
-                                            100,-2.0,2.0);
+                                          fGenRecPointsOffset + 22, kTRUE);
+  fSSDhTask += 1;
+  TH1F *fHistSSDChargeRatioLayer6 = new TH1F("SSD/ClusterCharge/Layer6/fHistSSDChargeRatioLayer6",
+                                         "Charge ratio - Layer 6;q_{ratio};Entries;",
+                                         100,-2.0,2.0);
   fAliITSQADataMakerRec->Add2RecPointsList(fHistSSDChargeRatioLayer6, 
-                                          fGenOffset + fSSDhRecs);
-  fSSDhRecs += 1;
-  TH1F *fHistSSDChargekeVLayer5 = new TH1F("fHistSSDChargekeVLayer5",
-                                          "Charge - Layer 5;q [keV];Entries;",
-                                          100,0.,300.);
+                                          fGenRecPointsOffset + 23, kTRUE);
+  fSSDhTask += 1;
+  TH1F *fHistSSDChargekeVLayer5 = new TH1F("SSD/ClusterCharge/Layer5/fHistSSDChargekeVLayer5",
+                                       "Charge - Layer 5;q [keV];Entries;",
+                                       100,0.,300.);
   fAliITSQADataMakerRec->Add2RecPointsList(fHistSSDChargekeVLayer5, 
-                                          fGenOffset + fSSDhRecs);
-  fSSDhRecs += 1;
-  TH1F *fHistSSDChargekeVLayer6 = new TH1F("fHistSSDChargekeVLayer6",
-                                          "Charge - Layer 6;q [keV];Entries;",
-                                          100,0.,300.);
+                                          fGenRecPointsOffset + 24);
+  fSSDhTask += 1;
+  TH1F *fHistSSDChargekeVLayer6 = new TH1F("SSD/ClusterCharge/Layer6/fHistSSDChargekeVLayer6",
+                                       "Charge - Layer 6;q [keV];Entries;",
+                                       100,0.,300.);
   fAliITSQADataMakerRec->Add2RecPointsList(fHistSSDChargekeVLayer6, 
-                                          fGenOffset + fSSDhRecs);
-  fSSDhRecs += 1;
-  TH1F *fHistSSDChargeADCLayer5 = new TH1F("fHistSSDChargeADCLayer5",
-                                          "Charge - Layer 5;q [ADC];Entries;",
-                                          100,0.,300.);
-  fAliITSQADataMakerRec->Add2RecPointsList(fHistSSDChargeADCLayer5, 
-                                          fGenOffset + fSSDhRecs);
-  fSSDhRecs += 1;
-  TH1F *fHistSSDChargeADCLayer6 = new TH1F("fHistSSDChargeADCLayer6",
-                                          "Charge - Layer 6;q [ADC];Entries;",
-                                          100,0.,300.);
-  fAliITSQADataMakerRec->Add2RecPointsList(fHistSSDChargeADCLayer6, 
-                                          fGenOffset + fSSDhRecs);
-  fSSDhRecs += 1;
-  TH2F *fHistSSDChargeMapLayer5 = new TH2F("fHistSSDChargeMapLayer5",
-                                          "Charge map;N_{modules};N_{Ladders}",
-                                          fgkSSDMODULESPERLADDERLAYER5,
-                                          -0.5,fgkSSDMODULESPERLADDERLAYER5+0.5,
-                                          3*fgkSSDLADDERSLAYER5,
-                                          -0.5,fgkSSDLADDERSLAYER5+0.5);
+                                          fGenRecPointsOffset + 25);
+  fSSDhTask += 1;
+  TH1F *fHistSSDChargePSideLayer5 = new TH1F("SSD/ClusterCharge/Layer5/fHistSSDChargePSideLayer5",
+                                          "Charge P- Layer 5;q_{P} [keV];Entries;",
+                                          100,0.,300.);
+  fAliITSQADataMakerRec->Add2RecPointsList(fHistSSDChargePSideLayer5,
+                                          fGenRecPointsOffset + 26, kTRUE);
+  fSSDhTask += 1;
+  TH1F *fHistSSDChargePSideLayer6 = new TH1F("SSD/ClusterCharge/Layer6/fHistSSDChargePSideLayer6",
+                                          "Charge P- Layer 6;q_{P} [keV];Entries;",
+                                          100,0.,300.);
+  fAliITSQADataMakerRec->Add2RecPointsList(fHistSSDChargePSideLayer6,
+                                          fGenRecPointsOffset + 27, kTRUE);
+  fSSDhTask += 1;
+  TH1F *fHistSSDChargeNSideLayer5 = new TH1F("SSD/ClusterCharge/Layer5/fHistSSDChargeNSideLayer5",
+                                          "Charge N- Layer 5;q_{N} [keV];Entries;",
+                                          100,0.,300.);
+  fAliITSQADataMakerRec->Add2RecPointsList(fHistSSDChargeNSideLayer5,
+                                          fGenRecPointsOffset + 28, kTRUE);
+  fSSDhTask += 1;
+  TH1F *fHistSSDChargeNSideLayer6 = new TH1F("SSD/ClusterCharge/Layer6/fHistSSDChargeNSideLayer6",
+                                          "Charge N- Layer 6;q_{N} [keV];Entries;",
+                                          100,0.,300.);
+  fAliITSQADataMakerRec->Add2RecPointsList(fHistSSDChargeNSideLayer6,
+                                          fGenRecPointsOffset + 29, kTRUE);
+  fSSDhTask += 1;
+  TH1F *fHistSSDChargeRatio2Layer5 = new TH1F("SSD/ClusterCharge/Layer5/fHistSSDChargeRatio2Layer5",
+                                          "Charge Ratio qN/qP - Layer 5;q_{N}/q_{P};Entries;",
+                                          100,0,2);
+  fAliITSQADataMakerRec->Add2RecPointsList(fHistSSDChargeRatio2Layer5,
+                                          fGenRecPointsOffset + 30, kTRUE);
+  fSSDhTask += 1;
+  TH1F *fHistSSDChargeRatio2Layer6 = new TH1F("SSD/ClusterCharge/Layer6/fHistSSDChargeRatio2Layer6",
+                                          "Charge Ratio qN/qP - Layer 6;q_{N}/q_{P};Entries;",
+                                          100,0,2);
+  fAliITSQADataMakerRec->Add2RecPointsList(fHistSSDChargeRatio2Layer6,
+                                          fGenRecPointsOffset + 31, kTRUE);
+  fSSDhTask += 1;
+  TH2F *fHistSSDChargePNSideLayer5 = new TH2F("SSD/ClusterCharge/Layer5/fHistSSDChargePNSideLayer5",
+                                           "Charge correlation - Layer 5;q_{P} [keV];q_{N} [keV]",
+                                           100,0.,300.,
+                                           100,0.,300.);
+  fAliITSQADataMakerRec->Add2RecPointsList(fHistSSDChargePNSideLayer5,
+                                          fGenRecPointsOffset + 32, kTRUE);
+  fSSDhTask += 1;
+  TH2F *fHistSSDChargePNSideLayer6 = new TH2F("SSD/ClusterCharge/Layer6/fHistSSDChargePNSideLayer6",
+                                           "Charge correlation - Layer 6;q_{P} [keV];q_{N} [keV]",
+                                           100,0.,300.,
+                                           100,0.,300.);
+  fAliITSQADataMakerRec->Add2RecPointsList(fHistSSDChargePNSideLayer6,
+                                          fGenRecPointsOffset + 33, kTRUE);
+  fSSDhTask += 1;
+  TH2F *fHistSSDChargeMapLayer5 = new TH2F("SSD/ClusterCharge/Layer5/fHistSSDChargeMapLayer5",
+                                       "Charge map;N_{modules};N_{Ladders}",
+                                       fgkSSDMODULESPERLADDERLAYER5,
+                                       -0.5,fgkSSDMODULESPERLADDERLAYER5+0.5,
+                                       3*fgkSSDLADDERSLAYER5,
+                                       -0.5,fgkSSDLADDERSLAYER5+0.5);
   fAliITSQADataMakerRec->Add2RecPointsList(fHistSSDChargeMapLayer5, 
-                                          fGenOffset + fSSDhRecs);
-  fSSDhRecs += 1;
-  TH2F *fHistSSDChargeMapLayer6 = new TH2F("fHistSSDChargeMapLayer6",
-                                          "Charge map;N_{modules};N_{Ladders}",
-                                          fgkSSDMODULESPERLADDERLAYER6,
-                                          -0.5,fgkSSDMODULESPERLADDERLAYER6+0.5,
-                                          3*fgkSSDLADDERSLAYER6,
-                                          -0.5,fgkSSDLADDERSLAYER6+0.5);
+                                          fGenRecPointsOffset + 34, kTRUE);
+  fSSDhTask += 1;
+  TH2F *fHistSSDChargeMapLayer6 = new TH2F("SSD/ClusterCharge/Layer6/fHistSSDChargeMapLayer6",
+                                       "Charge map;N_{modules};N_{Ladders}",
+                                       fgkSSDMODULESPERLADDERLAYER6,
+                                       -0.5,fgkSSDMODULESPERLADDERLAYER6+0.5,
+                                       3*fgkSSDLADDERSLAYER6,
+                                       -0.5,fgkSSDLADDERSLAYER6+0.5);
   fAliITSQADataMakerRec->Add2RecPointsList(fHistSSDChargeMapLayer6, 
-                                          fGenOffset + fSSDhRecs);
-  fSSDhRecs += 1;
+                                          fGenRecPointsOffset + 35, kTRUE);
+  fSSDhTask += 1;
+  TH2F *fHistSSDClusterMapLayer5 = new TH2F("SSD/Statistics/Layer5/fHistSSDClusterMapLayer5",
+                                         "Layer 5;N_{module};N_{ladder}",
+                                         22,1,23,
+                                         34,500,534);
+  fHistSSDClusterMapLayer5->GetXaxis()->SetTitleColor(1);
+  fHistSSDClusterMapLayer5->SetStats(kFALSE);
+  fHistSSDClusterMapLayer5->GetYaxis()->SetTitleOffset(1.8);
+  fHistSSDClusterMapLayer5->GetXaxis()->SetNdivisions(22);
+  fHistSSDClusterMapLayer5->GetYaxis()->SetNdivisions(34);
+  fHistSSDClusterMapLayer5->GetXaxis()->SetLabelSize(0.03);
+  fHistSSDClusterMapLayer5->GetYaxis()->SetLabelSize(0.03);
+  fHistSSDClusterMapLayer5->GetZaxis()->SetTitleOffset(1.4);
+  fHistSSDClusterMapLayer5->GetZaxis()->SetTitle("N_{clusters}");
+  fAliITSQADataMakerRec->Add2RecPointsList(fHistSSDClusterMapLayer5,
+                                          fGenRecPointsOffset + 36);
+  fSSDhTask += 1;
+  TH2F *fHistSSDClusterMapLayer6 = new TH2F("SSD/Statistics/Layer6/fHistSSDClusterMapLayer6",
+                                         "Layer 6;N_{module};N_{ladder}",
+                                         25,1,26,
+                                         38,600,638);
+  fHistSSDClusterMapLayer6->GetXaxis()->SetTitleColor(1);
+  fHistSSDClusterMapLayer6->SetStats(kFALSE);
+  fHistSSDClusterMapLayer6->GetYaxis()->SetTitleOffset(1.8);
+  fHistSSDClusterMapLayer6->GetXaxis()->SetNdivisions(25);
+  fHistSSDClusterMapLayer6->GetYaxis()->SetNdivisions(38);
+  fHistSSDClusterMapLayer6->GetXaxis()->SetLabelSize(0.03);
+  fHistSSDClusterMapLayer6->GetYaxis()->SetLabelSize(0.03);
+  fHistSSDClusterMapLayer6->GetZaxis()->SetTitleOffset(1.4);
+  fHistSSDClusterMapLayer6->GetZaxis()->SetTitle("N_{clusters}");
+  fAliITSQADataMakerRec->Add2RecPointsList(fHistSSDClusterMapLayer6,
+                                           fGenRecPointsOffset + 37);
+  fSSDhTask += 1;
 
-// custom code here
-//fSSDhRecs must be incremented by one unit every time a histogram is ADDED to the QA List
-
-  AliDebug(1,Form("%d SSD Recs histograms booked\n",fSSDhRecs));
+  AliDebug(1,Form("%d SSD Recs histograms booked\n",fSSDhTask));
 }
 
 //____________________________________________________________________________ 
 void AliITSQASSDDataMakerRec::MakeRecPoints(TTree *clustersTree)
 {
   // Fill QA for recpoints - SSD -
-  Int_t fLayer = 0, fLadder = 0, fModule = 0;
+
+  Int_t gLayer = 0, gLadder = 0, gModule = 0;
   Int_t lLadderLocationY = 0;
   TBranch *branchRecP = clustersTree->GetBranch("ITSRecPoints");
   if (!branchRecP) { 
     AliError("can't get the branch with the ITS clusters !");
     return;
   }
-  static TClonesArray recEmpty("AliITSRecPoint",1000);
-  recEmpty.Clear();
-  TClonesArray *recpoints = &recEmpty;
+  static TClonesArray statRecpoints("AliITSRecPoint");
+  TClonesArray *recpoints = &statRecpoints;
   branchRecP->SetAddress(&recpoints);
+  Int_t nClustersLayer5 = 0, nClustersLayer6 = 0;
   Int_t npoints = 0;      
   Float_t cluglo[3]={0.,0.,0.}; 
   for(Int_t module = 0; module < clustersTree->GetEntries(); module++){
     branchRecP->GetEvent(module);
     npoints += recpoints->GetEntries();
-    AliITSgeomTGeo::GetModuleId(module,fLayer,fLadder,fModule);
-    lLadderLocationY = 3*fLadder;
+    AliITSgeomTGeo::GetModuleId(module,gLayer,gLadder,gModule);
+    lLadderLocationY = 3*gLadder;
 
     for(Int_t j = 0;j < recpoints->GetEntries(); j++){
       AliITSRecPoint *recp = (AliITSRecPoint*)recpoints->At(j);    
@@ -635,82 +1175,58 @@ void AliITSQASSDDataMakerRec::MakeRecPoints(TTree *clustersTree)
       Float_t radius = TMath::Sqrt(cluglo[0]*cluglo[0]+cluglo[1]*cluglo[1]); 
       Float_t phi = TMath::ATan2(cluglo[1],cluglo[0]);
       Float_t theta = TMath::ATan2(radius,cluglo[2]);
+      Double_t chargeRatio = recp->GetChargeRatio();
+      Double_t clusterCharge = recp->GetQ();
+      Double_t chargePSide = clusterCharge*(1. + chargeRatio);
+      Double_t chargeNSide = clusterCharge*(1. - chargeRatio);
       if(layer == 4) {
-       fAliITSQADataMakerRec->GetRecPointsData(fGenOffset + 0)->Fill(module);
-       fAliITSQADataMakerRec->GetRecPointsData(fGenOffset + 2)->Fill(recp->GetDetLocalX());
-       fAliITSQADataMakerRec->GetRecPointsData(fGenOffset + 4)->Fill(recp->GetDetLocalZ());
-       fAliITSQADataMakerRec->GetRecPointsData(fGenOffset + 6)->Fill(cluglo[0]);
-       fAliITSQADataMakerRec->GetRecPointsData(fGenOffset + 8)->Fill(cluglo[1]);
-       fAliITSQADataMakerRec->GetRecPointsData(fGenOffset + 10)->Fill(cluglo[2]);
-       fAliITSQADataMakerRec->GetRecPointsData(fGenOffset + 12)->Fill(phi);
-       fAliITSQADataMakerRec->GetRecPointsData(fGenOffset + 14)->Fill(theta);
-       fAliITSQADataMakerRec->GetRecPointsData(fGenOffset + 16)->Fill(radius);
-       fAliITSQADataMakerRec->GetRecPointsData(fGenOffset + 18)->Fill(recp->GetType());
-       fAliITSQADataMakerRec->GetRecPointsData(fGenOffset + 20)->Fill(recp->GetChargeRatio());
-       fAliITSQADataMakerRec->GetRecPointsData(fGenOffset + 22)->Fill(recp->GetQ());
-       fAliITSQADataMakerRec->GetRecPointsData(fGenOffset + 26)->SetBinContent(fModule,lLadderLocationY,recp->GetQ());
+       fAliITSQADataMakerRec->GetRecPointsData(fGenRecPointsOffset + 0)->Fill(module);
+       fAliITSQADataMakerRec->GetRecPointsData(fGenRecPointsOffset + 4)->Fill(recp->GetDetLocalX());
+       fAliITSQADataMakerRec->GetRecPointsData(fGenRecPointsOffset + 6)->Fill(recp->GetDetLocalZ());
+       fAliITSQADataMakerRec->GetRecPointsData(fGenRecPointsOffset + 8)->Fill(cluglo[0]);
+       fAliITSQADataMakerRec->GetRecPointsData(fGenRecPointsOffset + 10)->Fill(cluglo[1]);
+       fAliITSQADataMakerRec->GetRecPointsData(fGenRecPointsOffset + 12)->Fill(cluglo[2]);
+       fAliITSQADataMakerRec->GetRecPointsData(fGenRecPointsOffset + 14)->Fill(phi);
+       fAliITSQADataMakerRec->GetRecPointsData(fGenRecPointsOffset + 16)->Fill(theta);
+       fAliITSQADataMakerRec->GetRecPointsData(fGenRecPointsOffset + 18)->Fill(radius);
+       fAliITSQADataMakerRec->GetRecPointsData(fGenRecPointsOffset + 20)->Fill(recp->GetType());
+       fAliITSQADataMakerRec->GetRecPointsData(fGenRecPointsOffset + 22)->Fill(recp->GetChargeRatio());
+       fAliITSQADataMakerRec->GetRecPointsData(fGenRecPointsOffset + 24)->Fill(recp->GetQ());
+       fAliITSQADataMakerRec->GetRecPointsData(fGenRecPointsOffset + 26)->Fill(chargePSide);
+       fAliITSQADataMakerRec->GetRecPointsData(fGenRecPointsOffset + 28)->Fill(chargeNSide);
+       if(chargePSide != 0.) fAliITSQADataMakerRec->GetRecPointsData(fGenRecPointsOffset + 30)->Fill(chargeNSide/chargePSide);
+       fAliITSQADataMakerRec->GetRecPointsData(fGenRecPointsOffset + 32)->Fill(chargePSide,chargeNSide);
+       fAliITSQADataMakerRec->GetRecPointsData(fGenRecPointsOffset + 34)->SetBinContent(gModule,lLadderLocationY,recp->GetQ());
+       ((TH2F *)fAliITSQADataMakerRec->GetRecPointsData(fGenRecPointsOffset + 36))->Fill(gModule,499+gLadder,1);
+       nClustersLayer5 += 1;
       }//layer 5 histograms
       if(layer == 5) {
-       fAliITSQADataMakerRec->GetRecPointsData(fGenOffset + 1)->Fill(module);
-       fAliITSQADataMakerRec->GetRecPointsData(fGenOffset + 3)->Fill(recp->GetDetLocalX());
-       fAliITSQADataMakerRec->GetRecPointsData(fGenOffset + 5)->Fill(recp->GetDetLocalZ());
-       fAliITSQADataMakerRec->GetRecPointsData(fGenOffset + 7)->Fill(cluglo[0]);
-       fAliITSQADataMakerRec->GetRecPointsData(fGenOffset + 9)->Fill(cluglo[1]);
-       fAliITSQADataMakerRec->GetRecPointsData(fGenOffset + 11)->Fill(cluglo[2]);
-       fAliITSQADataMakerRec->GetRecPointsData(fGenOffset + 13)->Fill(phi);
-       fAliITSQADataMakerRec->GetRecPointsData(fGenOffset + 15)->Fill(theta);
-       fAliITSQADataMakerRec->GetRecPointsData(fGenOffset + 17)->Fill(radius);
-       fAliITSQADataMakerRec->GetRecPointsData(fGenOffset + 19)->Fill(recp->GetType());
-       fAliITSQADataMakerRec->GetRecPointsData(fGenOffset + 21)->Fill(recp->GetChargeRatio());
-       fAliITSQADataMakerRec->GetRecPointsData(fGenOffset + 23)->Fill(recp->GetQ());
-       fAliITSQADataMakerRec->GetRecPointsData(fGenOffset + 27)->SetBinContent(fModule,lLadderLocationY,recp->GetQ());
+       fAliITSQADataMakerRec->GetRecPointsData(fGenRecPointsOffset + 1)->Fill(module);
+       fAliITSQADataMakerRec->GetRecPointsData(fGenRecPointsOffset + 5)->Fill(recp->GetDetLocalX());
+       fAliITSQADataMakerRec->GetRecPointsData(fGenRecPointsOffset + 7)->Fill(recp->GetDetLocalZ());
+       fAliITSQADataMakerRec->GetRecPointsData(fGenRecPointsOffset + 9)->Fill(cluglo[0]);
+       fAliITSQADataMakerRec->GetRecPointsData(fGenRecPointsOffset + 11)->Fill(cluglo[1]);
+       fAliITSQADataMakerRec->GetRecPointsData(fGenRecPointsOffset + 13)->Fill(cluglo[2]);
+       fAliITSQADataMakerRec->GetRecPointsData(fGenRecPointsOffset + 15)->Fill(phi);
+       fAliITSQADataMakerRec->GetRecPointsData(fGenRecPointsOffset + 17)->Fill(theta);
+       fAliITSQADataMakerRec->GetRecPointsData(fGenRecPointsOffset + 19)->Fill(radius);
+       fAliITSQADataMakerRec->GetRecPointsData(fGenRecPointsOffset + 21)->Fill(recp->GetType());
+       fAliITSQADataMakerRec->GetRecPointsData(fGenRecPointsOffset + 23)->Fill(recp->GetChargeRatio());
+       fAliITSQADataMakerRec->GetRecPointsData(fGenRecPointsOffset + 25)->Fill(recp->GetQ());
+        fAliITSQADataMakerRec->GetRecPointsData(fGenRecPointsOffset + 27)->Fill(chargePSide);
+        fAliITSQADataMakerRec->GetRecPointsData(fGenRecPointsOffset + 29)->Fill(chargeNSide);
+        if(chargePSide != 0.) fAliITSQADataMakerRec->GetRecPointsData(fGenRecPointsOffset + 31)->Fill(chargeNSide/chargePSide);
+        fAliITSQADataMakerRec->GetRecPointsData(fGenRecPointsOffset + 33)->Fill(chargePSide,chargeNSide);
+       fAliITSQADataMakerRec->GetRecPointsData(fGenRecPointsOffset + 35)->SetBinContent(gModule,lLadderLocationY,recp->GetQ());
+       ((TH2F *)fAliITSQADataMakerRec->GetRecPointsData(fGenRecPointsOffset + 37))->Fill(gModule,599+gLadder,1);
+       nClustersLayer6 += 1;
       }//layer 6 histograms
     }//rec. points loop
   }//module loop
-}
 
-//____________________________________________________________________________ 
-/*void AliITSQASSDDataMakerRec::InitESDs() {  
-  // Initialization for ESD - SSD -
-  fESDsOffset = (fAliITSQADataMakerRec->fESDsQAList)->GetEntries();
-  AliDebug(1,Form("Number of ESD histograms (SPD+SDD): %d\n",fRawsOffset));
-  
-  TH1F *fHistSSDTrackPt = new TH1F("fHistSSDTrackPt",
-                                  ";P_{T} [GeV/c];dN/dP_{T}",
-                                  100,0.1,10.1);
-  fAliITSQADataMakerRec->Add2ESDPointsList(fHistSSDTrackPt, 
-                                          fESDsOffset + fSSDhESDs);
-  fSSDhESDs += 1;
-  TH1F *fHistSSDTrackEta = new TH1F("fHistSSDTrackEta",
-                                  ";#eta;dN/d#eta",
-                                  40,-2.,2.);
-  fAliITSQADataMakerRec->Add2ESDPointsList(fHistSSDTrackEta,
-                                          fESDsOffset + fSSDhESDs);
-  fSSDhESDs += 1;
-  TH1F *fHistSSDTrackPhi = new TH1F("fHistSSDTrackPhi",
-                                  ";#phi;dN/d#phi",
-                                  100,0,2.*TMath::Pi());
-  fAliITSQADataMakerRec->Add2ESDPointsList(fHistSSDTrackPhi,
-                                          fESDsOffset + fSSDhESDs);
-  fSSDhESDs += 1;
-  
-  AliDebug(1,Form("%d SSD ESDs histograms booked\n",fSSDhESDs));
-  AliInfo(Form("Number of histograms (ITS): %d\n",fESDsOffset+fSSDhESDs));  
-}
+  fAliITSQADataMakerRec->GetRecPointsData(fGenRecPointsOffset + 2)->Fill(nClustersLayer5);
+  fAliITSQADataMakerRec->GetRecPointsData(fGenRecPointsOffset + 3)->Fill(nClustersLayer6);
 
-//____________________________________________________________________________
-void AliITSQASSDDataMakerRec::MakeESDs(AliESDEvent * esd) {
-  // make QA data from ESDs
-  Int_t clusters[12] = {0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0};
-  for(Int_t j = 0; j < esd->GetNumberOfTracks(); j++) {
-    AliESDtrack *track = esd->GetTrack(j);
-    if ((track->GetStatus() & AliESDtrack::kITSrefit)==0) continue;
-    Int_t nClustersITS = track->GetITSclusters(clusters);
-
-   (fAliITSQADataMakerRec->GetESDsData(fESDsOffset+0))->Fill(track->Pt());
-   (fAliITSQADataMakerRec->GetESDsData(fESDsOffset+1))->Fill(track->Eta());
-   (fAliITSQADataMakerRec->GetESDsData(fESDsOffset+2))->Fill(track->Phi());
-  }//track loop
+  statRecpoints.Clear();
 }
-*/