]> git.uio.no Git - u/mrichter/AliRoot.git/blobdiff - ITS/AliITSQASDDDataMakerRec.cxx
Fixing segfault
[u/mrichter/AliRoot.git] / ITS / AliITSQASDDDataMakerRec.cxx
index bf2ffc23e9493f4b7e75528b5d9f21505b831771..c8ab7f8482b25e1717929fba33e47498a2a98e5f 100644 (file)
@@ -28,6 +28,7 @@
 
 #include <TProfile2D.h>
 #include <TH2D.h>
+#include <TH1F.h>
 #include <TBranch.h>
 #include <TTree.h>
 #include <TGaxis.h>
@@ -89,9 +90,11 @@ fBadAnodesCurrent(0)
   }
        fGenRawsOffset = new Int_t[AliRecoParam::kNSpecies];
        fGenRecPointsOffset = new Int_t[AliRecoParam::kNSpecies];
+       fGenDigitsOffset = new Int_t[AliRecoParam::kNSpecies];
        for(Int_t i=0; i<AliRecoParam::kNSpecies; i++) {
                fGenRawsOffset[i] = 0;
                fGenRecPointsOffset[i] = 0;
+               fGenDigitsOffset[i]=0;
        }
 }
 
@@ -112,7 +115,8 @@ fDDLModuleMap(0),
 fGoodAnodes(qadm.fGoodAnodes),
 fBadAnodes(qadm.fBadAnodes),
 fGoodAnodesCurrent(qadm.fGoodAnodesCurrent),
-fBadAnodesCurrent(qadm.fBadAnodesCurrent){
+fBadAnodesCurrent(qadm.fBadAnodesCurrent)
+{
   //copy ctor 
   fAliITSQADataMakerRec->SetName((const char*)qadm.fAliITSQADataMakerRec->GetName()) ; 
   fAliITSQADataMakerRec->SetTitle((const char*)qadm.fAliITSQADataMakerRec->GetTitle());
@@ -122,7 +126,7 @@ fBadAnodesCurrent(qadm.fBadAnodesCurrent){
 //____________________________________________________________________________ 
 AliITSQASDDDataMakerRec::~AliITSQASDDDataMakerRec(){
   // destructor
-  //   if(fDDLModuleMap) delete fDDLModuleMap;
+  //if(fDDLModuleMap) delete fDDLModuleMap;
 }
 //__________________________________________________________________
 AliITSQASDDDataMakerRec& AliITSQASDDDataMakerRec::operator = (const AliITSQASDDDataMakerRec& qac )
@@ -143,11 +147,13 @@ void AliITSQASDDDataMakerRec::StartOfDetectorCycle()
 //____________________________________________________________________________ 
 void AliITSQASDDDataMakerRec::EndOfDetectorCycle(AliQAv1::TASKINDEX_t /*task*/, TObjArray* /*list*/)
 {
+  
   // launch the QA checking
        if(fkOnline) {
                AnalyseBNG(); // Analyse Baseline, Noise, Gain
                AnalyseINJ(); // Analyse Injectors
        }
+  
        AliDebug(AliQAv1::GetQADebugLevel(),"AliITSDM instantiates checker with Run(AliQAv1::kITS, task, list)\n"); 
 }
 
@@ -158,7 +164,11 @@ Int_t AliITSQASDDDataMakerRec::InitRaws()
   const Bool_t expert   = kTRUE ; 
   const Bool_t saveCorr = kTRUE ; 
   const Bool_t image    = kTRUE ; 
+
+
+
   Int_t rv = 0 ; 
+  /*
   AliCDBEntry *ddlMapSDD = AliCDBManager::Instance()->Get("ITS/Calib/DDLMapSDD");
   Bool_t cacheStatus = AliCDBManager::Instance()->GetCacheFlag();
   if(!ddlMapSDD)
@@ -174,7 +184,7 @@ Int_t AliITSQASDDDataMakerRec::InitRaws()
     {
       delete ddlMapSDD;
     }
-
+  */
   Int_t lay, lad, det;
   Int_t indexlast = 0;
   Int_t index1 = 0;
@@ -190,23 +200,20 @@ Int_t AliITSQASDDDataMakerRec::InitRaws()
   TH1D *h0 = new TH1D("SDDModPattern","HW Modules pattern",fgknSDDmodules,239.5,499.5); //0
   h0->GetXaxis()->SetTitle("Module Number");
   h0->GetYaxis()->SetTitle("Counts");
-   rv = fAliITSQADataMakerRec->Add2RawsList((new TH1D(*h0)),0+fGenRawsOffset[fAliITSQADataMakerRec->GetEventSpecie()], expert, !image, !saveCorr);
-  delete h0;
+  rv = fAliITSQADataMakerRec->Add2RawsList(h0,0+fGenRawsOffset[fAliITSQADataMakerRec->GetEventSpecie()], expert, !image, !saveCorr);
   fSDDhRawsTask++;
   
   //zPhi distribution using ladder and modules numbers
-  TH2D *hphil3 = new TH2D("SDDphizL3","SDD #varphiz Layer3 ",6,0.5,6.5,14,0.5,14.5);
+  TH2D *hphil3 = new TH2D("SDDphizL3","SDD #varphiz Layer3 ",12,0.5,6.5,14,0.5,14.5);
   hphil3->GetXaxis()->SetTitle("z[#Module L3 ]");
   hphil3->GetYaxis()->SetTitle("#varphi[#Ladder L3]");
-   rv = fAliITSQADataMakerRec->Add2RawsList((new TH2D(*hphil3)),1+fGenRawsOffset[fAliITSQADataMakerRec->GetEventSpecie()], expert, image, saveCorr); 
-  delete hphil3;
+  rv = fAliITSQADataMakerRec->Add2RawsList(hphil3,1+fGenRawsOffset[fAliITSQADataMakerRec->GetEventSpecie()], !expert, image, saveCorr); 
   fSDDhRawsTask++;
   
-  TH2D *hphil4 = new TH2D("SDDphizL4","SDD #varphiz Layer4 ",8,0.5,8.5,22,0.5,22.5); 
+  TH2D *hphil4 = new TH2D("SDDphizL4","SDD #varphiz Layer4 ",16,0.5,8.5,22,0.5,22.5); 
   hphil4->GetXaxis()->SetTitle("z[#Module L4]");
   hphil4->GetYaxis()->SetTitle("#varphi[#Ladder L4]");
-   rv = fAliITSQADataMakerRec->Add2RawsList((new TH2D(*hphil4)),2+fGenRawsOffset[fAliITSQADataMakerRec->GetEventSpecie()], expert, image, saveCorr); 
-  delete hphil4;
+   rv = fAliITSQADataMakerRec->Add2RawsList(hphil4,2+fGenRawsOffset[fAliITSQADataMakerRec->GetEventSpecie()], !expert, image, saveCorr); 
   fSDDhRawsTask++;
   
 
@@ -214,11 +221,10 @@ Int_t AliITSQASDDDataMakerRec::InitRaws()
     {
 
       //DDL Pattern 
-      TH2D *hddl = new TH2D("SDDDDLPattern","SDD DDL Pattern ",24,-0.5,23.5,24,-0.5,23.5); 
+      TH2D *hddl = new TH2D("SDDDDLPattern","SDD DDL Pattern ",24,-0.5,11.5,24,-0.5,23.5); 
       hddl->GetXaxis()->SetTitle("Channel");
       hddl->GetYaxis()->SetTitle("#DDL");
-      rv = fAliITSQADataMakerRec->Add2RawsList((new TH2D(*hddl)),3+fGenRawsOffset[fAliITSQADataMakerRec->GetEventSpecie()], expert, !image, !saveCorr);
-      delete hddl;
+      rv = fAliITSQADataMakerRec->Add2RawsList(hddl,3+fGenRawsOffset[fAliITSQADataMakerRec->GetEventSpecie()], expert, !image, !saveCorr);
       fSDDhRawsTask++;
       Int_t indexlast1 = 0;
   
@@ -261,6 +267,12 @@ Int_t AliITSQASDDDataMakerRec::InitRaws()
        }
       }
       
+      //Event Size 
+      TH1F *hsize = new TH1F("SDDEventSize","SDD Event Size ",1000,-0.5,999.5); 
+      hsize->GetXaxis()->SetTitle("Event Size [kB]");
+      hsize->GetYaxis()->SetTitle("Entries");
+      rv = fAliITSQADataMakerRec->Add2RawsList(hsize,indexlast1 + index1 + fGenRawsOffset[fAliITSQADataMakerRec->GetEventSpecie()], expert, !image, !saveCorr);
+      fSDDhRawsTask++;
          
     }  // kONLINE
   
@@ -277,12 +289,15 @@ Int_t AliITSQASDDDataMakerRec::MakeRaws(AliRawReader* rawReader)
   // Check id histograms already created for this Event Specie
 
   if(!fDDLModuleMap){
-    AliError("SDD DDL module map not available - skipping SDD QA");
-    return rv;
+    CreateTheMap();
+    //AliError("SDD DDL module map not available - skipping SDD QA");
+    //return rv;
+  
   }
   if(rawReader->GetType() != 7) return rv;  // skips non physical triggers
   AliDebug(AliQAv1::GetQADebugLevel(),"entering MakeRaws\n");                 
   rawReader->Reset();       
+  rawReader->Select("ITSSDD");
   AliITSRawStream *stream=AliITSRawStreamSDD::CreateRawStreamSDD(rawReader);
    stream->SetDDLModuleMap(fDDLModuleMap);
   
@@ -304,11 +319,19 @@ Int_t AliITSQASDDDataMakerRec::MakeRaws(AliRawReader* rawReader)
   Int_t iddl = -1;
   Int_t isddmod = -1;
   Int_t coord1, coord2, signal, moduleSDD, activeModule, index1; 
-  
+  //if(fkOnline)
+  //{
+      Int_t prevDDLID = -1;
+      UInt_t size = 0;
+      int totalddl=static_cast<int>(fDDLModuleMap->GetNDDLs());
+      Bool_t *ddldata=new Bool_t[totalddl];
+      for(Int_t jddl=0;jddl<totalddl;jddl++){ddldata[jddl]=kFALSE;}
+      //}
   while(stream->Next()) {
     ildcID = rawReader->GetLDCId();
-    iddl = rawReader->GetDDLID() - fgkDDLIDshift;
-    
+    iddl = rawReader->GetDDLID();// - fgkDDLIDshift;
+
+
     isddmod = fDDLModuleMap->GetModuleNumber(iddl,stream->GetCarlosId());
     if(isddmod==-1){
       AliDebug(AliQAv1::GetQADebugLevel(),Form("Found module with iddl: %d, stream->GetCarlosId: %d \n",iddl,stream->GetCarlosId()));
@@ -319,6 +342,14 @@ Int_t AliITSQASDDDataMakerRec::MakeRaws(AliRawReader* rawReader)
       continue;
     } 
     if(stream->IsCompletedDDL()) {
+
+      if(fkOnline){
+       if ((rawReader->GetDDLID() != prevDDLID)&&(ddldata[iddl])==kFALSE){
+         size += rawReader->GetDataSize();//in bytes
+         prevDDLID = rawReader->GetDDLID();
+         ddldata[iddl]=kTRUE;
+       }
+      }
       AliDebug(AliQAv1::GetQADebugLevel(),Form("IsCompletedDDL == KTRUE\n"));
       continue;
     } 
@@ -335,19 +366,17 @@ Int_t AliITSQASDDDataMakerRec::MakeRaws(AliRawReader* rawReader)
     }
     
     AliITSgeomTGeo::GetModuleId(isddmod, lay, lad, det);
-    fAliITSQADataMakerRec->GetRawsData( 0 + fGenRawsOffset[fAliITSQADataMakerRec->GetEventSpecie()] )->Fill(isddmod);   
-    if(lay==3)    fAliITSQADataMakerRec->GetRawsData(1+fGenRawsOffset[fAliITSQADataMakerRec->GetEventSpecie()])->Fill(det,lad); 
-    if(lay==4) { 
-      fAliITSQADataMakerRec->GetRawsData(2+fGenRawsOffset[fAliITSQADataMakerRec->GetEventSpecie()])->Fill(det,lad);}  
-    
     Short_t iside = stream->GetChannel();
-    
-
-    
 
+    //printf(" \n%i %i %i %i \n ",lay, lad, det,iside );
+    fAliITSQADataMakerRec->GetRawsData( 0 + fGenRawsOffset[fAliITSQADataMakerRec->GetEventSpecie()] )->Fill(isddmod);   
+    if(lay==3)    fAliITSQADataMakerRec->GetRawsData(1+fGenRawsOffset[fAliITSQADataMakerRec->GetEventSpecie()])->Fill(det+0.5*iside-0.5,lad); 
+    if(lay==4) { 
+      fAliITSQADataMakerRec->GetRawsData(2+fGenRawsOffset[fAliITSQADataMakerRec->GetEventSpecie()])->Fill(det+0.5*iside-0.5,lad);}  
     if(fkOnline) {
 
-      fAliITSQADataMakerRec->GetRawsData(3+fGenRawsOffset[fAliITSQADataMakerRec->GetEventSpecie()])->Fill(2*(stream->GetCarlosId())+iside,iddl);
+      fAliITSQADataMakerRec->GetRawsData(3+fGenRawsOffset[fAliITSQADataMakerRec->GetEventSpecie()])->Fill((stream->GetCarlosId())+0.5*iside -0.5,iddl);
 
       activeModule = moduleSDD;
       index1 = activeModule * 2 + iside;
@@ -356,15 +385,20 @@ Int_t AliITSQASDDDataMakerRec::MakeRaws(AliRawReader* rawReader)
         AliDebug(AliQAv1::GetQADebugLevel(),Form("Wrong index number %d - patched to 0\n",index1));
        index1 = 0;
       }      
-      fAliITSQADataMakerRec->GetRawsData(3+fGenRawsOffset[fAliITSQADataMakerRec->GetEventSpecie()])->Fill(2*(stream->GetCarlosId())+iside,iddl);
+
       if(fSDDhRawsTask > 4 + index1) {                                  
         ((TProfile2D *)(fAliITSQADataMakerRec->GetRawsData(4 + index1 +fGenRawsOffset[fAliITSQADataMakerRec->GetEventSpecie()])))->Fill(coord2, coord1, signal);     
         ((TProfile2D *)(fAliITSQADataMakerRec->GetRawsData(4 + index1 + 260*2 +fGenRawsOffset[fAliITSQADataMakerRec->GetEventSpecie()])))->Fill(coord2, coord1, signal); 
       }
-    }
+
+    }//online
     cnt++;
     if(!(cnt%10000)) AliDebug(AliQAv1::GetQADebugLevel(),Form(" %d raw digits read",cnt));
-  }
+  }//end next()
+  if(fkOnline)
+    {
+      ((TH1F*)(fAliITSQADataMakerRec->GetRawsData(4 + 260*4 +fGenRawsOffset[fAliITSQADataMakerRec->GetEventSpecie()])))->Fill(size/1024.);//KB
+    }
   AliDebug(AliQAv1::GetQADebugLevel(),Form("Event completed, %d raw digits read",cnt)); 
   delete stream;
   stream = NULL; 
@@ -374,7 +408,8 @@ Int_t AliITSQASDDDataMakerRec::MakeRaws(AliRawReader* rawReader)
 //             AnalyseINJ(); // Analyse Injectors
 //     }
 
-
+  delete []ddldata;
+  ddldata=NULL;
   return rv ; 
 }
 
@@ -392,23 +427,27 @@ Int_t AliITSQASDDDataMakerRec::InitDigits()
   TH1F* h0=new TH1F("SDD DIGITS Module Pattern","SDD DIGITS Module Pattern",260,239.5,499.5);       //hmod
   h0->GetXaxis()->SetTitle("SDD Module Number");
   h0->GetYaxis()->SetTitle("# DIGITS");
-  rv = fAliITSQADataMakerRec->Add2DigitsList(h0,fGenDigitsOffset, !expert, image);
+  rv = fAliITSQADataMakerRec->Add2DigitsList(h0,fGenDigitsOffset[fAliITSQADataMakerRec->GetEventSpecie()], !expert, image);
   fSDDhDigitsTask ++;
+  // printf("Add %s \t the task offset is %i\n",fAliITSQADataMakerRec->GetDigitsData(fGenDigitsOffset[fAliITSQADataMakerRec->GetEventSpecie()])->GetName() , fSDDhDigitsTask );
   TH1F* h1=new TH1F("SDD Anode Distribution","DIGITS Anode Distribution",512,-0.5,511.5);      //hanocc
   h1->GetXaxis()->SetTitle("Anode Number");
   h1->GetYaxis()->SetTitle("# DIGITS");
-  rv = fAliITSQADataMakerRec->Add2DigitsList(h1,1+fGenDigitsOffset, !expert, image);
+  rv = fAliITSQADataMakerRec->Add2DigitsList(h1,1+fGenDigitsOffset[fAliITSQADataMakerRec->GetEventSpecie()], !expert, image);
   fSDDhDigitsTask ++;
+  //printf("Add %s \t the task offset is %i\n",fAliITSQADataMakerRec->GetDigitsData(1+fGenDigitsOffset[fAliITSQADataMakerRec->GetEventSpecie()])->GetName() , fSDDhDigitsTask );
   TH1F* h2=new TH1F("SDD Tbin Distribution","DIGITS Tbin Distribution",256,-0.5,255.5);      //htbocc
   h2->GetXaxis()->SetTitle("Tbin Number");
   h2->GetYaxis()->SetTitle("# DIGITS");
-  rv = fAliITSQADataMakerRec->Add2DigitsList(h2,2+fGenDigitsOffset, !expert, image);
+  rv = fAliITSQADataMakerRec->Add2DigitsList(h2,2+fGenDigitsOffset[fAliITSQADataMakerRec->GetEventSpecie()], !expert, image);
   fSDDhDigitsTask ++;
+  //printf("Add %s \t the task offset is %i\n",fAliITSQADataMakerRec->GetDigitsData(2+fGenDigitsOffset[fAliITSQADataMakerRec->GetEventSpecie()])->GetName() , fSDDhDigitsTask );
   TH1F* h3=new TH1F("SDD ADC Counts Distribution","DIGITS ADC Counts Distribution",200,0.,1024.);          //hsig
   h3->GetXaxis()->SetTitle("ADC Value");
   h3->GetYaxis()->SetTitle("# DIGITS");
-  rv = fAliITSQADataMakerRec->Add2DigitsList(h3,3+fGenDigitsOffset, !expert, image);
+  rv = fAliITSQADataMakerRec->Add2DigitsList(h3,3+fGenDigitsOffset[fAliITSQADataMakerRec->GetEventSpecie()], !expert, image);
   fSDDhDigitsTask ++;
+  //printf("Add %s \t the task offset is %i\n",fAliITSQADataMakerRec->GetDigitsData(3+fGenDigitsOffset[fAliITSQADataMakerRec->GetEventSpecie()])->GetName() , fSDDhDigitsTask );
   AliDebug(AliQAv1::GetQADebugLevel(),Form("%d SDD Digits histograms booked\n",fSDDhDigitsTask));
   return rv ; 
 }
@@ -443,16 +482,16 @@ Int_t AliITSQASDDDataMakerRec::MakeDigits(TTree * digits)
     Int_t nmod=i+240;
     digits->GetEvent(nmod);
     Int_t ndigits = iITSdigits->GetEntries();
-    fAliITSQADataMakerRec->GetDigitsData(fGenDigitsOffset)->Fill(nmod,ndigits);
+    fAliITSQADataMakerRec->GetDigitsData(fGenDigitsOffset[fAliITSQADataMakerRec->GetEventSpecie()])->Fill(nmod,ndigits);
 
     for (Int_t idig=0; idig<ndigits; idig++) {
       AliITSdigit *dig=(AliITSdigit*)iITSdigits->UncheckedAt(idig);
       Int_t iz=dig->GetCoord1();  // cell number z
       Int_t ix=dig->GetCoord2();  // cell number x
       Int_t sig=dig->GetSignal();
-      fAliITSQADataMakerRec->GetDigitsData(1+fGenDigitsOffset)->Fill(iz);
-      fAliITSQADataMakerRec->GetDigitsData(2+fGenDigitsOffset)->Fill(ix);
-      fAliITSQADataMakerRec->GetDigitsData(3+fGenDigitsOffset)->Fill(sig);
+      fAliITSQADataMakerRec->GetDigitsData(1+fGenDigitsOffset[fAliITSQADataMakerRec->GetEventSpecie()])->Fill(iz);
+      fAliITSQADataMakerRec->GetDigitsData(2+fGenDigitsOffset[fAliITSQADataMakerRec->GetEventSpecie()])->Fill(ix);
+      fAliITSQADataMakerRec->GetDigitsData(3+fGenDigitsOffset[fAliITSQADataMakerRec->GetEventSpecie()])->Fill(sig);
     }
   }
   return rv ; 
@@ -486,120 +525,118 @@ Int_t AliITSQASDDDataMakerRec::InitRecPoints()
   TH1F *h0 = new TH1F("SDDLay3TotCh","Layer 3 total charge",1000/nOnline,-0.5, 499.5); //position number 0
   h0->GetXaxis()->SetTitle("ADC value");
   h0->GetYaxis()->SetTitle("Entries");
-  rv = fAliITSQADataMakerRec->Add2RecPointsList((new TH1F(*h0)), 0 +fGenRecPointsOffset[fAliITSQADataMakerRec->GetEventSpecie()], !expert, image);
-  //delete h0;
+  rv = fAliITSQADataMakerRec->Add2RecPointsList(h0, 0 +fGenRecPointsOffset[fAliITSQADataMakerRec->GetEventSpecie()], !expert, image);
   fSDDhRecPointsTask++;
  
   TH1F *h1 = new TH1F("SDDLay4TotCh","Layer 4 total charge",1000/nOnline,-0.5, 499.5);//position number 1
   h1->GetXaxis()->SetTitle("ADC value");
   h1->GetYaxis()->SetTitle("Entries");
-  rv = fAliITSQADataMakerRec->Add2RecPointsList((new TH1F(*h1)), 1 +fGenRecPointsOffset[fAliITSQADataMakerRec->GetEventSpecie()], !expert, image);
-  delete h1;
+  rv = fAliITSQADataMakerRec->Add2RecPointsList(h1, 1 +fGenRecPointsOffset[fAliITSQADataMakerRec->GetEventSpecie()], !expert, image);
   fSDDhRecPointsTask++;
 
   char hisnam[50];
   TH2F *h2 = new TH2F("SDDGlobalCoordDistribYX","YX Global Coord Distrib",5600/nOnline2,-28,28,5600/nOnline2,-28,28);//position number 2
   h2->GetYaxis()->SetTitle("Y[cm]");
   h2->GetXaxis()->SetTitle("X[cm]");
-  rv = fAliITSQADataMakerRec->Add2RecPointsList((new TH2F(*h2)),2+fGenRecPointsOffset[fAliITSQADataMakerRec->GetEventSpecie()], !expert, !image);
-  delete h2;
+  rv = fAliITSQADataMakerRec->Add2RecPointsList(h2,2+fGenRecPointsOffset[fAliITSQADataMakerRec->GetEventSpecie()], !expert, !image);
   fSDDhRecPointsTask++;
 
   TH2F *h3 = new TH2F("SDDGlobalCoordDistribRZ","RZ Global Coord Distrib",6400/nOnline3,-32,32,1400/nOnline4,12,26);//position number 3
   h3->GetYaxis()->SetTitle("R[cm]");
   h3->GetXaxis()->SetTitle("Z[cm]");
-  rv = fAliITSQADataMakerRec->Add2RecPointsList((new TH2F(*h3)),3+fGenRecPointsOffset[fAliITSQADataMakerRec->GetEventSpecie()], !expert, !image);
-  delete h3;
+  rv = fAliITSQADataMakerRec->Add2RecPointsList(h3,3+fGenRecPointsOffset[fAliITSQADataMakerRec->GetEventSpecie()], !expert, !image);
   fSDDhRecPointsTask++;
   
   TH2F *h4 = new TH2F("SDDGlobalCoordDistribL3PHIZ","#varphi Z Global Coord Distrib L3",6400/nOnline3,-32,32,360/nOnline,-TMath::Pi(),TMath::Pi());//position number 4
   h4->GetYaxis()->SetTitle("#phi[rad]");
   h4->GetXaxis()->SetTitle("Z[cm]");
-  rv = fAliITSQADataMakerRec->Add2RecPointsList((new TH2F(*h4)),4+fGenRecPointsOffset[fAliITSQADataMakerRec->GetEventSpecie()], !expert, image);
-  delete h4;
+  rv = fAliITSQADataMakerRec->Add2RecPointsList(h4,4+fGenRecPointsOffset[fAliITSQADataMakerRec->GetEventSpecie()], !expert, image);
   fSDDhRecPointsTask++;
 
   TH2F *h5 = new TH2F("SDDGlobalCoordDistribL4PHIZ","#varphi Z Global Coord Distrib L4",6400/nOnline3,-32,32,360/nOnline,-TMath::Pi(),TMath::Pi());//position number 5
   h5->GetYaxis()->SetTitle("#phi[rad]");
   h5->GetXaxis()->SetTitle("Z[cm]");
-  rv = fAliITSQADataMakerRec->Add2RecPointsList((new TH2F(*h5)),5+fGenRecPointsOffset[fAliITSQADataMakerRec->GetEventSpecie()], !expert, image);
-  delete h5;
+  rv = fAliITSQADataMakerRec->Add2RecPointsList(h5,5+fGenRecPointsOffset[fAliITSQADataMakerRec->GetEventSpecie()], !expert, image);
   fSDDhRecPointsTask++;
   
   TH1F *h6 = new TH1F("SDDModPatternRP","Modules pattern RP",fgknSDDmodules,239.5,499.5); //position number 6
   h6->GetXaxis()->SetTitle("Module number"); //spd offset = 240
   h6->GetYaxis()->SetTitle("Entries");
-  rv = fAliITSQADataMakerRec->Add2RecPointsList((new TH1F(*h6)),6 +fGenRecPointsOffset[fAliITSQADataMakerRec->GetEventSpecie()], expert, !image);
-  delete h6;
+  rv = fAliITSQADataMakerRec->Add2RecPointsList(h6,6 +fGenRecPointsOffset[fAliITSQADataMakerRec->GetEventSpecie()], expert, !image);
   fSDDhRecPointsTask++;
+
   TH1F *h7 = new TH1F("SDDLadPatternL3RP","Ladder pattern L3 RP",14,0.5,14.5);  //position number 7
   h7->GetXaxis()->SetTitle("Ladder #, Layer 3");
   h7->GetYaxis()->SetTitle("Entries");
-  rv = fAliITSQADataMakerRec->Add2RecPointsList((new TH1F(*h7)),7 +fGenRecPointsOffset[fAliITSQADataMakerRec->GetEventSpecie()], expert, !image);
-  delete h7;
+  rv = fAliITSQADataMakerRec->Add2RecPointsList(h7,7 +fGenRecPointsOffset[fAliITSQADataMakerRec->GetEventSpecie()], expert, !image);
   fSDDhRecPointsTask++;
+
   TH1F *h8 = new TH1F("SDDLadPatternL4RP","Ladder pattern L4 RP",22,0.5,22.5); //position number 8
   h8->GetXaxis()->SetTitle("Ladder #, Layer 4");
   h8->GetYaxis()->SetTitle("Entries");
-  rv = fAliITSQADataMakerRec->Add2RecPointsList((new TH1F(*h8)),8 +fGenRecPointsOffset[fAliITSQADataMakerRec->GetEventSpecie()], expert, !image);
-  delete h8;
+  rv = fAliITSQADataMakerRec->Add2RecPointsList(h8,8 +fGenRecPointsOffset[fAliITSQADataMakerRec->GetEventSpecie()], expert, !image);
   fSDDhRecPointsTask++;
+
   TH2F *h9 = new TH2F("SDDLocalCoordDistrib","Local Coord Distrib",1000/nOnline,-4,4,1000/nOnline,-4,4);//position number 9
   h9->GetXaxis()->SetTitle("X local coord, drift, cm");
   h9->GetYaxis()->SetTitle("Z local coord, anode, cm");
-  rv = fAliITSQADataMakerRec->Add2RecPointsList((new TH2F(*h9)),9 +fGenRecPointsOffset[fAliITSQADataMakerRec->GetEventSpecie()], expert, !image);
-  delete h9;
+  rv = fAliITSQADataMakerRec->Add2RecPointsList(h9,9 +fGenRecPointsOffset[fAliITSQADataMakerRec->GetEventSpecie()], expert, !image);
   fSDDhRecPointsTask++;
-
-       //AliInfo("Create SDD recpoints histos\n");
-
-    TH1F *h10 = new TH1F("SDDrdistrib_Layer3" ,"SDD r distribution Layer3" ,100,14.,18.);//position number 10 (L3)
-    h10->GetXaxis()->SetTitle("r[cm]");
-    h10->GetXaxis()->CenterTitle();
-    h10->GetYaxis()->SetTitle("Entries");
-    rv = fAliITSQADataMakerRec->Add2RecPointsList((new TH1F(*h10)),10 +fGenRecPointsOffset[fAliITSQADataMakerRec->GetEventSpecie()], expert, !image);
-    delete h10;
-    fSDDhRecPointsTask++;
-
-    TH1F *h11 = new TH1F("SDDrdistrib_Layer4" ,"SDD r distribution Layer4" ,100,22.,26.);// and position number 11 (L4)
-    h11->GetXaxis()->SetTitle("r[cm]");
-    h11->GetXaxis()->CenterTitle();
-    h11->GetYaxis()->SetTitle("Entries");
-    rv = fAliITSQADataMakerRec->Add2RecPointsList((new TH1F(*h11)),11 +fGenRecPointsOffset[fAliITSQADataMakerRec->GetEventSpecie()], expert, !image);
-    delete h11;
-    fSDDhRecPointsTask++;
-
+  
+  //AliInfo("Create SDD recpoints histos\n");
+  
+  TH1F *h10 = new TH1F("SDDrdistrib_Layer3" ,"SDD r distribution Layer3" ,100,14.,18.);//position number 10 (L3)
+  h10->GetXaxis()->SetTitle("r[cm]");
+  h10->GetXaxis()->CenterTitle();
+  h10->GetYaxis()->SetTitle("Entries");
+  rv = fAliITSQADataMakerRec->Add2RecPointsList(h10,10 +fGenRecPointsOffset[fAliITSQADataMakerRec->GetEventSpecie()], expert, !image);
+  fSDDhRecPointsTask++;
+  
+  TH1F *h11 = new TH1F("SDDrdistrib_Layer4" ,"SDD r distribution Layer4" ,100,22.,26.);// and position number 11 (L4)
+  h11->GetXaxis()->SetTitle("r[cm]");
+  h11->GetXaxis()->CenterTitle();
+  h11->GetYaxis()->SetTitle("Entries");
+  rv = fAliITSQADataMakerRec->Add2RecPointsList(h11,11 +fGenRecPointsOffset[fAliITSQADataMakerRec->GetEventSpecie()], expert, !image);
+  fSDDhRecPointsTask++;
+  
   for(Int_t iLay=0; iLay<=1; iLay++){
     sprintf(hisnam,"SDDphidistrib_Layer%d",iLay+3);
     TH1F *h12 = new TH1F(hisnam,hisnam,180,-TMath::Pi(),TMath::Pi());//position number 12 (L3) and position number 13 (L4)
     h12->GetXaxis()->SetTitle("#varphi[rad]");
     h12->GetXaxis()->CenterTitle();
     h12->GetYaxis()->SetTitle("Entries");
-    rv = fAliITSQADataMakerRec->Add2RecPointsList((new TH1F(*h12)),iLay+12+fGenRecPointsOffset[fAliITSQADataMakerRec->GetEventSpecie()], expert, !image);
-    delete h12;
+    rv = fAliITSQADataMakerRec->Add2RecPointsList(h12,iLay+12+fGenRecPointsOffset[fAliITSQADataMakerRec->GetEventSpecie()], expert, !image);
     fSDDhRecPointsTask++;
   }
-
+  
+  for(Int_t iLay=0; iLay<=1; iLay++){
+    sprintf(hisnam,"SDDdrifttime_Layer%d",iLay+3);
+    TH1F *h14 = new TH1F(hisnam,hisnam,200,-0.5,9999.5);//position number 14 (L3) and position number 15 (L4)
+    h14->GetXaxis()->SetTitle("#varphi[rad]");
+    h14->GetXaxis()->CenterTitle();
+    h14->GetYaxis()->SetTitle("Entries");
+    rv = fAliITSQADataMakerRec->Add2RecPointsList(h14,iLay+14+fGenRecPointsOffset[fAliITSQADataMakerRec->GetEventSpecie()], !expert, image);
+    fSDDhRecPointsTask++;
+  }
+  
   if(fkOnline)
     {
-      TH2F *h14 = new TH2F("SDDGlobalCoordDistribYXFSE","YX Global Coord Distrib FSE",5600/nOnline2,-28,28,5600/nOnline2,-28,28);//position number 14
-      h14->GetYaxis()->SetTitle("Y[cm]");
-      h14->GetXaxis()->SetTitle("X[cm]");
-      rv = fAliITSQADataMakerRec->Add2RecPointsList((new TH2F(*h14)),14+fGenRecPointsOffset[fAliITSQADataMakerRec->GetEventSpecie()], expert, !image);
-      delete h14;
+      TH2F *h16 = new TH2F("SDDGlobalCoordDistribYXFSE","YX Global Coord Distrib FSE",5600/nOnline2,-28,28,5600/nOnline2,-28,28);//position number 16
+      h16->GetYaxis()->SetTitle("Y[cm]");
+      h16->GetXaxis()->SetTitle("X[cm]");
+      rv = fAliITSQADataMakerRec->Add2RecPointsList(h16,16+fGenRecPointsOffset[fAliITSQADataMakerRec->GetEventSpecie()], expert, !image);
       fSDDhRecPointsTask++;
       
-      TH2F *h15 = new TH2F("SDDGlobalCoordDistribRZFSE","RZ Global Coord Distrib FSE",Int_t(6400/nOnline3),-32,32,1400/nOnline4,12,26);//position number 15
-      h15->GetYaxis()->SetTitle("R[cm]");
-      h15->GetXaxis()->SetTitle("Z[cm]");
-      rv = fAliITSQADataMakerRec->Add2RecPointsList((new TH2F(*h15)),15+fGenRecPointsOffset[fAliITSQADataMakerRec->GetEventSpecie()], expert, !image);
-      delete h15;
+      TH2F *h17 = new TH2F("SDDGlobalCoordDistribRZFSE","RZ Global Coord Distrib FSE",Int_t(6400/nOnline3),-32,32,1400/nOnline4,12,26);//position number 17
+      h17->GetYaxis()->SetTitle("R[cm]");
+      h17->GetXaxis()->SetTitle("Z[cm]");
+      rv = fAliITSQADataMakerRec->Add2RecPointsList(h17,17+fGenRecPointsOffset[fAliITSQADataMakerRec->GetEventSpecie()], expert, !image);
       fSDDhRecPointsTask++;
       
     }//online
-
+  
   AliDebug(AliQAv1::GetQADebugLevel(),Form("%d SDD Recs histograms booked\n",fSDDhRecPointsTask));
-
+  
   return rv ; 
 }
 
@@ -609,11 +646,6 @@ Int_t AliITSQASDDDataMakerRec::MakeRecPoints(TTree * clustersTree)
  // Fill QA for RecPoints - SDD -
   Int_t rv = 0 ; 
 
-  //AliInfo(Form("fAliITSQADataMakerRec->GetEventSpecie() %d\n",fAliITSQADataMakerRec->GetEventSpecie()));
-  //AliInfo(Form("fGenRecPointsOffset[fAliITSQADataMakerRec->GetEventSpecie()] %d\n",fGenRecPointsOffset[fAliITSQADataMakerRec->GetEventSpecie()]));
-  // Check id histograms already created for this Event Specie
-//  if ( ! fAliITSQADataMakerRec->GetRecPointsData(fGenRecPointsOffset[fAliITSQADataMakerRec->GetEventSpecie()]) )
-//    rv = InitRecPoints() ;
   Int_t lay, lad, det; 
   //AliInfo("get the branch with the ITS clusters !\n");
   TBranch *branchRecP = clustersTree->GetBranch("ITSRecPoints");
@@ -629,53 +661,54 @@ Int_t AliITSQASDDDataMakerRec::MakeRecPoints(TTree * clustersTree)
   Float_t cluglo[3]={0.,0.,0.}; 
   if(fkOnline)
     {
-      for(Int_t i=14;i<16;i++)
+      for(Int_t i=16;i<18;i++)
        {
          fAliITSQADataMakerRec->GetRecPointsData(i+fGenRecPointsOffset[fAliITSQADataMakerRec->GetEventSpecie()])->Reset();
        }
     }
-       for(Int_t module=0; module<clustersTree->GetEntries();module++){
-               //AliInfo(Form("Module %d\n",module));
-               branchRecP->GetEvent(module);
-               npoints += recpoints->GetEntries();
-               //AliInfo(Form("modnumb %d, npoints %d, total points %d\n",module, recpoints->GetEntries(),npoints));
-               AliITSgeomTGeo::GetModuleId(module, lay, lad, det);
-               //AliInfo(Form("modnumb %d, lay %d, lad %d, det %d \n",module, lay, lad, det));
-               Bool_t kSDD = kFALSE;
-               if(lay == 3 || lay == 4) kSDD = kTRUE;
-               if(!kSDD) continue;
-               //AliInfo(Form("modnumb %d, entries %d\n",module, recpoints->GetEntries()));
-               for(Int_t j=0;j<recpoints->GetEntries();j++){
-                       //AliInfo(Form("modnumb %d, entry %d \n",module, j));
-                       AliITSRecPoint *recp = (AliITSRecPoint*)recpoints->At(j);    
-                       fAliITSQADataMakerRec->GetRecPointsData(6 +fGenRecPointsOffset[fAliITSQADataMakerRec->GetEventSpecie()])->Fill(module);//modpatternrp
-                       recp->GetGlobalXYZ(cluglo);
-                       Float_t rad=TMath::Sqrt(cluglo[0]*cluglo[0]+cluglo[1]*cluglo[1]); 
-                       Float_t phi=TMath::ATan2(cluglo[1],cluglo[0]);
-                       fAliITSQADataMakerRec->GetRecPointsData(9 +fGenRecPointsOffset[fAliITSQADataMakerRec->GetEventSpecie()])->Fill(recp->GetDetLocalX(),recp->GetDetLocalZ());//local distribution
-                       fAliITSQADataMakerRec->GetRecPointsData(2 +fGenRecPointsOffset[fAliITSQADataMakerRec->GetEventSpecie()])->Fill(cluglo[0],cluglo[1]);//global distribution YX
-                       fAliITSQADataMakerRec->GetRecPointsData(3 +fGenRecPointsOffset[fAliITSQADataMakerRec->GetEventSpecie()])->Fill(cluglo[2],rad);//global distribution rz
-                       if(fkOnline) {
-                               fAliITSQADataMakerRec->GetRecPointsData(14 +fGenRecPointsOffset[fAliITSQADataMakerRec->GetEventSpecie()])->Fill(cluglo[0],cluglo[1]);//global distribution YX FSE
-                               fAliITSQADataMakerRec->GetRecPointsData(15 +fGenRecPointsOffset[fAliITSQADataMakerRec->GetEventSpecie()])->Fill(cluglo[2],rad);//global distribution rz FSE
-                       }
-                       if(recp->GetLayer() == 2) {
-                               fAliITSQADataMakerRec->GetRecPointsData(0  +fGenRecPointsOffset[fAliITSQADataMakerRec->GetEventSpecie()])->Fill(recp->GetQ()) ;//total charge of layer 3
-                               fAliITSQADataMakerRec->GetRecPointsData(7  +fGenRecPointsOffset[fAliITSQADataMakerRec->GetEventSpecie()])->Fill(lad);//lad pattern layer 3
-                               fAliITSQADataMakerRec->GetRecPointsData(10 +fGenRecPointsOffset[fAliITSQADataMakerRec->GetEventSpecie()])->Fill(rad);//r distribution layer 3
-                               fAliITSQADataMakerRec->GetRecPointsData(12 +fGenRecPointsOffset[fAliITSQADataMakerRec->GetEventSpecie()])->Fill(phi);// phi distribution layer 3
-                               fAliITSQADataMakerRec->GetRecPointsData(4  +fGenRecPointsOffset[fAliITSQADataMakerRec->GetEventSpecie()])->Fill(cluglo[2],phi);// phi distribution layer 3
-                       } else if(recp->GetLayer() == 3) {
-                               fAliITSQADataMakerRec->GetRecPointsData(1  +fGenRecPointsOffset[fAliITSQADataMakerRec->GetEventSpecie()])->Fill(recp->GetQ()) ;//total charge layer 4
-                               fAliITSQADataMakerRec->GetRecPointsData(8  +fGenRecPointsOffset[fAliITSQADataMakerRec->GetEventSpecie()])->Fill(lad);//ladpatternlayer4
-                               fAliITSQADataMakerRec->GetRecPointsData(11 +fGenRecPointsOffset[fAliITSQADataMakerRec->GetEventSpecie()])->Fill(rad);//r distribution
-                               fAliITSQADataMakerRec->GetRecPointsData(13 +fGenRecPointsOffset[fAliITSQADataMakerRec->GetEventSpecie()])->Fill(phi);//phi distribution
-                               fAliITSQADataMakerRec->GetRecPointsData(5  +fGenRecPointsOffset[fAliITSQADataMakerRec->GetEventSpecie()])->Fill(cluglo[2],phi);// phi distribution layer 4
-                       }
-               }
-       }
-       statRecpoints.Clear();
-       return rv ; 
+  for(Int_t module=0; module<clustersTree->GetEntries();module++){
+    //AliInfo(Form("Module %d\n",module));
+    branchRecP->GetEvent(module);
+    npoints += recpoints->GetEntries();
+    //AliInfo(Form("modnumb %d, npoints %d, total points %d\n",module, recpoints->GetEntries(),npoints));
+    AliITSgeomTGeo::GetModuleId(module, lay, lad, det);
+    //AliInfo(Form("modnumb %d, lay %d, lad %d, det %d \n",module, lay, lad, det));
+    
+    //AliInfo(Form("modnumb %d, entries %d\n",module, recpoints->GetEntries()));
+    for(Int_t j=0;j<recpoints->GetEntries();j++){
+      //AliInfo(Form("modnumb %d, entry %d \n",module, j));
+      AliITSRecPoint *recp = (AliITSRecPoint*)recpoints->At(j);    
+      fAliITSQADataMakerRec->GetRecPointsData(6 +fGenRecPointsOffset[fAliITSQADataMakerRec->GetEventSpecie()])->Fill(module);//modpatternrp
+      recp->GetGlobalXYZ(cluglo);
+      Float_t rad=TMath::Sqrt(cluglo[0]*cluglo[0]+cluglo[1]*cluglo[1]); 
+      Float_t phi=TMath::ATan2(cluglo[1],cluglo[0]);
+      Float_t drifttime=recp->GetDriftTime();
+      fAliITSQADataMakerRec->GetRecPointsData(9 +fGenRecPointsOffset[fAliITSQADataMakerRec->GetEventSpecie()])->Fill(recp->GetDetLocalX(),recp->GetDetLocalZ());//local distribution
+      fAliITSQADataMakerRec->GetRecPointsData(2 +fGenRecPointsOffset[fAliITSQADataMakerRec->GetEventSpecie()])->Fill(cluglo[0],cluglo[1]);//global distribution YX
+      fAliITSQADataMakerRec->GetRecPointsData(3 +fGenRecPointsOffset[fAliITSQADataMakerRec->GetEventSpecie()])->Fill(cluglo[2],rad);//global distribution rz
+      if(fkOnline) {
+       fAliITSQADataMakerRec->GetRecPointsData(16 +fGenRecPointsOffset[fAliITSQADataMakerRec->GetEventSpecie()])->Fill(cluglo[0],cluglo[1]);//global distribution YX FSE
+       fAliITSQADataMakerRec->GetRecPointsData(17 +fGenRecPointsOffset[fAliITSQADataMakerRec->GetEventSpecie()])->Fill(cluglo[2],rad);//global distribution rz FSE
+      }
+      if(recp->GetLayer() == 2) {
+       fAliITSQADataMakerRec->GetRecPointsData(0  +fGenRecPointsOffset[fAliITSQADataMakerRec->GetEventSpecie()])->Fill(recp->GetQ()) ;//total charge of layer 3
+       fAliITSQADataMakerRec->GetRecPointsData(7  +fGenRecPointsOffset[fAliITSQADataMakerRec->GetEventSpecie()])->Fill(lad);//lad pattern layer 3
+       fAliITSQADataMakerRec->GetRecPointsData(10 +fGenRecPointsOffset[fAliITSQADataMakerRec->GetEventSpecie()])->Fill(rad);//r distribution layer 3
+       fAliITSQADataMakerRec->GetRecPointsData(12 +fGenRecPointsOffset[fAliITSQADataMakerRec->GetEventSpecie()])->Fill(phi);// phi distribution layer 3
+       fAliITSQADataMakerRec->GetRecPointsData(4  +fGenRecPointsOffset[fAliITSQADataMakerRec->GetEventSpecie()])->Fill(cluglo[2],phi);// zphi distribution layer
+       fAliITSQADataMakerRec->GetRecPointsData(14  +fGenRecPointsOffset[fAliITSQADataMakerRec->GetEventSpecie()])->Fill(drifttime);// time distribution layer 3
+      } else if(recp->GetLayer() == 3) {
+       fAliITSQADataMakerRec->GetRecPointsData(1  +fGenRecPointsOffset[fAliITSQADataMakerRec->GetEventSpecie()])->Fill(recp->GetQ()) ;//total charge layer 4
+       fAliITSQADataMakerRec->GetRecPointsData(8  +fGenRecPointsOffset[fAliITSQADataMakerRec->GetEventSpecie()])->Fill(lad);//ladpatternlayer4
+       fAliITSQADataMakerRec->GetRecPointsData(11 +fGenRecPointsOffset[fAliITSQADataMakerRec->GetEventSpecie()])->Fill(rad);//r distribution
+       fAliITSQADataMakerRec->GetRecPointsData(13 +fGenRecPointsOffset[fAliITSQADataMakerRec->GetEventSpecie()])->Fill(phi);//phi distribution
+       fAliITSQADataMakerRec->GetRecPointsData(5  +fGenRecPointsOffset[fAliITSQADataMakerRec->GetEventSpecie()])->Fill(cluglo[2],phi);// zphi distribution layer 4
+       fAliITSQADataMakerRec->GetRecPointsData(15  +fGenRecPointsOffset[fAliITSQADataMakerRec->GetEventSpecie()])->Fill(drifttime);// time distribution layer 4
+      }
+    }
+  }
+  statRecpoints.Clear();
+  return rv ; 
 }
 
 //_______________________________________________________________
@@ -689,7 +722,7 @@ Int_t AliITSQASDDDataMakerRec::GetOffset(AliQAv1::TASKINDEX_t task)
     }
   else if(task == AliQAv1::kDIGITSR )
     {
-      offset=fGenDigitsOffset;
+      offset=fGenDigitsOffset[fAliITSQADataMakerRec->GetEventSpecie()];
     }
   else if( task == AliQAv1::kRECPOINTS )
     {
@@ -706,7 +739,7 @@ void AliITSQASDDDataMakerRec::SetOffset(AliQAv1::TASKINDEX_t task, Int_t offset,
     fGenRawsOffset[specie]=offset;
   }
   else if( task == AliQAv1::kDIGITSR ) {
-    fGenDigitsOffset=offset;
+    fGenDigitsOffset[specie]=offset;
   }
   else if( task == AliQAv1::kRECPOINTS ) {
     fGenRecPointsOffset[specie]=offset;
@@ -745,52 +778,67 @@ void AliITSQASDDDataMakerRec::AnalyseBNG()
 
 // get file time for Previous test
        AliInfo("AnalyseBNG\n");
-       static Int_t bngtimePrevious[6]; 
+       Int_t bngtimeBasPrevious; 
+       FILE *fpinPreviousBas = fopen( "SDDbasHistos.time", "r" );
+       if(fpinPreviousBas) {
+         fscanf(fpinPreviousBas,"%d",&bngtimeBasPrevious);
+         fclose (fpinPreviousBas);
+       } else 
+          bngtimeBasPrevious = 0;
+        Int_t bngtimeBasCurrent = 0; 
+        gSystem->Exec("perl -e '@d=localtime ((stat(shift))[9]); printf \"%02d%02d%02d%02d%02d\n\", $d[5]-100,$d[4]+1,$d[3],$d[2],$d[1]'  SDDbasHistos.root > SDDbasHistos.time");
+        FILE *fpinBas = fopen( "SDDbasHistos.time", "r" );
+        fscanf(fpinBas,"%d",&bngtimeBasCurrent);
+       if(bngtimeBasCurrent>bngtimeBasPrevious )AliInfo(Form("bngtimeBasCurrent %d, bngtimeBasPrevious %d\n",bngtimeBasCurrent,bngtimeBasPrevious));
+       
+       Bool_t kAnalyseBas = kTRUE;
+       if(bngtimeBasCurrent <= bngtimeBasPrevious) kAnalyseBas = kFALSE;
+       if(kAnalyseBas) {
+               // new bng file found
+               bngtimeBasPrevious = bngtimeBasCurrent;
+               Bool_t kFilesExist = kTRUE;
+               TFile basFile("SDDbasHistos.root");
+               if(basFile.IsZombie()) kFilesExist = kFALSE;
+               if(kFilesExist) {
+                 AnodeStatus();
+                 AnalyseHistos(1); // Baseline
+                 AnalyseHistos(2); // Uncorrected Noise
+                 AnalyseHistos(3); // Common Mode Noise
+                 AnalyseHistos(4); // Corrected Noise
+                 gSystem->Exec("cp SDDbasHistos.root SDDbasHistosPrevious.root");
+               } else {
+                       AliInfo("file SDDbasHistos.root not found \n");
+               }
+       }
+       fclose (fpinBas);
+//     delete fpinBas;
+
+       Int_t bngtimeGainPrevious; 
        FILE *fpinPrevious = fopen( "SDDgainHistos.time", "r" );
        if(fpinPrevious) {
-               for(Int_t i=0; i<6; i++) fscanf(fpinPrevious,"%d",&bngtimePrevious[i]);
-               fclose (fpinPrevious);
+         fscanf(fpinPrevious,"%d",&bngtimeGainPrevious);
+         fclose (fpinPrevious);
        } else 
-               for(Int_t i=0; i<6; i++) bngtimePrevious[i] = 0;
-       Int_t bngtimeCurrent[6] = { 0 }; 
-       gSystem->Exec("perl -e '@d=localtime ((stat(shift))[9]); printf \"%02d%02d%02d%02d%02d\n\", $d[5]-100,$d[4]+1,$d[3],$d[2],$d[1]'  SDDgainHistos1.root > SDDgainHistos.time");
-       gSystem->Exec("perl -e '@d=localtime ((stat(shift))[9]); printf \"%02d%02d%02d%02d%02d\n\", $d[5]-100,$d[4]+1,$d[3],$d[2],$d[1]'  SDDgainHistos2.root >> SDDgainHistos.time");
-       gSystem->Exec("perl -e '@d=localtime ((stat(shift))[9]); printf \"%02d%02d%02d%02d%02d\n\", $d[5]-100,$d[4]+1,$d[3],$d[2],$d[1]'  SDDgainHistos3.root >> SDDgainHistos.time");
-       gSystem->Exec("perl -e '@d=localtime ((stat(shift))[9]); printf \"%02d%02d%02d%02d%02d\n\", $d[5]-100,$d[4]+1,$d[3],$d[2],$d[1]'  SDDgainHistos4.root >> SDDgainHistos.time");
-       gSystem->Exec("perl -e '@d=localtime ((stat(shift))[9]); printf \"%02d%02d%02d%02d%02d\n\", $d[5]-100,$d[4]+1,$d[3],$d[2],$d[1]'  SDDgainHistos5.root >> SDDgainHistos.time");
-       gSystem->Exec("perl -e '@d=localtime ((stat(shift))[9]); printf \"%02d%02d%02d%02d%02d\n\", $d[5]-100,$d[4]+1,$d[3],$d[2],$d[1]'  SDDgainHistos6.root >> SDDgainHistos.time");
-       FILE *fpin = fopen( "SDDgainHistos.time", "r" );
-       for(Int_t i=0; i<6; i++) {
-               fscanf(fpin,"%d",&bngtimeCurrent[i]);
-//             AliInfo(Form("bngtimeCurrent[%d] %d, bngtimePrevious[%d] %d\n",i,bngtimeCurrent[i],i,bngtimePrevious[i]));
-       }
+         bngtimeGainPrevious = 0;
+        Int_t bngtimeGainCurrent = 0; 
+        gSystem->Exec("perl -e '@d=localtime ((stat(shift))[9]); printf \"%02d%02d%02d%02d%02d\n\", $d[5]-100,$d[4]+1,$d[3],$d[2],$d[1]'  SDDgainHistos.root > SDDgainHistos.time");
+        FILE *fpin = fopen( "SDDgainHistos.time", "r" );
+        fscanf(fpin,"%d",&bngtimeGainCurrent);
+        if(bngtimeGainCurrent>bngtimeGainPrevious )AliInfo(Form("bngtimeGainCurrent %d, bngtimeGainPrevious %d\n",bngtimeGainCurrent,bngtimeGainPrevious));
+       
        Bool_t kAnalyse = kTRUE;
-       for(Int_t i=0; i<6; i++) if(bngtimeCurrent[i] <= bngtimePrevious[i]) kAnalyse = kFALSE;
+       if(bngtimeGainCurrent <= bngtimeGainPrevious) kAnalyse = kFALSE;
        if(kAnalyse) {
-               // new bng file found
-               for(Int_t i=0; i<6; i++) bngtimePrevious[i] = bngtimeCurrent[i];
+               // new bng file found
+               bngtimeGainPrevious = bngtimeGainCurrent;
                Bool_t kFilesExist = kTRUE;
-               char *hname = new char[50];
-               for(Int_t i=0; i<6; i++) {
-                       sprintf(hname,"SDDgainHistos%d.root",i+1);
-                       TFile gainFile(hname);
-                       if(gainFile.IsZombie()) kFilesExist = kFALSE;
-               }
+               TFile gainFile("SDDgainHistos.root");
+               if(gainFile.IsZombie()) kFilesExist = kFALSE;
                if(kFilesExist) {
-                       AnodeStatus();
-                       AnalyseHistos(1); // Baseline
-                       AnalyseHistos(2); // Uncorrected Noise
-                       AnalyseHistos(3); // Common Mode Noise
-                       AnalyseHistos(4); // Corrected Noise
-                       AnalyseHistos(5); // Gain
-                       gSystem->Exec("cp SDDgainHistos1.root SDDgainHistosPrevious1.root");
-                       gSystem->Exec("cp SDDgainHistos2.root SDDgainHistosPrevious2.root");
-                       gSystem->Exec("cp SDDgainHistos3.root SDDgainHistosPrevious3.root");
-                       gSystem->Exec("cp SDDgainHistos4.root SDDgainHistosPrevious4.root");
-                       gSystem->Exec("cp SDDgainHistos5.root SDDgainHistosPrevious5.root");
-                       gSystem->Exec("cp SDDgainHistos6.root SDDgainHistosPrevious6.root");
+                 AnalyseHistos(5); // Gain
+                 gSystem->Exec("cp SDDgainHistos.root SDDgainHistosPrevious.root");
                } else {
-                       AliInfo("file(s) SDDgainHistos .root not found \n");
+                       AliInfo("file SDDgainHistos.root not found \n");
                }
        }
        fclose (fpin);
@@ -805,77 +853,36 @@ void AliITSQASDDDataMakerRec::AnalyseINJ()
 // get file time for last test
 
        AliInfo("AnalyseINJ\n");
-       static Int_t injtimePrevious[6]
+       Int_t injtimePrevious
        FILE *fpinPrevious = fopen( "SDDinjectHistos.time", "r" );
        if(fpinPrevious) {
-               for(Int_t i=0; i<6; i++) fscanf(fpinPrevious,"%d",&injtimePrevious[i]);
-               fclose (fpinPrevious);
+          fscanf(fpinPrevious,"%d",&injtimePrevious);
+         fclose (fpinPrevious);
        } else 
-               for(Int_t i=0; i<6; i++) injtimePrevious[i] = 0;
-       Int_t injtimeCurrent[6] = { 0 }; 
-       gSystem->Exec("perl -e '@d=localtime ((stat(shift))[9]); printf \"%02d%02d%02d%02d%02d\n\", $d[5]-100,$d[4]+1,$d[3],$d[2],$d[1]'  SDDinjectHistos1.root > SDDinjectHistos.time");
-       gSystem->Exec("perl -e '@d=localtime ((stat(shift))[9]); printf \"%02d%02d%02d%02d%02d\n\", $d[5]-100,$d[4]+1,$d[3],$d[2],$d[1]'  SDDinjectHistos2.root >> SDDinjectHistos.time");
-       gSystem->Exec("perl -e '@d=localtime ((stat(shift))[9]); printf \"%02d%02d%02d%02d%02d\n\", $d[5]-100,$d[4]+1,$d[3],$d[2],$d[1]'  SDDinjectHistos3.root >> SDDinjectHistos.time");
-       gSystem->Exec("perl -e '@d=localtime ((stat(shift))[9]); printf \"%02d%02d%02d%02d%02d\n\", $d[5]-100,$d[4]+1,$d[3],$d[2],$d[1]'  SDDinjectHistos4.root >> SDDinjectHistos.time");
-       gSystem->Exec("perl -e '@d=localtime ((stat(shift))[9]); printf \"%02d%02d%02d%02d%02d\n\", $d[5]-100,$d[4]+1,$d[3],$d[2],$d[1]'  SDDinjectHistos5.root >> SDDinjectHistos.time");
-       gSystem->Exec("perl -e '@d=localtime ((stat(shift))[9]); printf \"%02d%02d%02d%02d%02d\n\", $d[5]-100,$d[4]+1,$d[3],$d[2],$d[1]'  SDDinjectHistos6.root >> SDDinjectHistos.time");
-       FILE *fpin = fopen( "SDDinjectHistos.time", "r" );
-       for(Int_t i=0; i<6; i++) {
-               fscanf(fpin,"%d",&injtimeCurrent[i]);
-//             AliInfo(Form("injtimeCurrent[%d] %d, injtimePrevious[%d] %d\n",i,injtimeCurrent[i],i,injtimePrevious[i]));
-       }
+         injtimePrevious = 0;
+       Int_t injtimeCurrent = 0; 
+        gSystem->Exec("perl -e '@d=localtime ((stat(shift))[9]); printf \"%02d%02d%02d%02d%02d\n\", $d[5]-100,$d[4]+1,$d[3],$d[2],$d[1]'  SDDinjectHistos.root > SDDinjectHistos.time");
+        FILE *fpin = fopen( "SDDinjectHistos.time", "r" );
+       fscanf(fpin,"%d",&injtimeCurrent);
+               if(injtimeCurrent>injtimePrevious )AliInfo(Form("injtimeCurrent %d, injtimePrevious %d\n",injtimeCurrent,injtimePrevious));
+       
        Bool_t kAnalyse = kTRUE;
-       for(Int_t i=0; i<6; i++) if(injtimeCurrent[i] <= injtimePrevious[i]) kAnalyse = kFALSE;
+       if(injtimeCurrent <= injtimePrevious) kAnalyse = kFALSE;
        if(kAnalyse) {
                // new inj file found
-               for(Int_t i=0; i<6; i++) injtimePrevious[i] = injtimeCurrent[i];
+               injtimePrevious = injtimeCurrent;
                Bool_t kFilesExist = kTRUE;
-               char *hname = new char[50];
-               for(Int_t i=0; i<6; i++) {
-                       sprintf(hname,"SDDinjectHistos%d.root",i+1);
-                       TFile gainFile(hname);
-                       if(gainFile.IsZombie()) kFilesExist = kFALSE;
-               }
+               TFile gainFile("SDDinjectHistos.root");
+                       if(gainFile.IsZombie()) kFilesExist = kFALSE;
+               
                if(kFilesExist) {
                        AnalyseHistos(6); // Drift Speed
-                       gSystem->Exec("cp SDDinjectHistos1.root SDDinjectHistosPrevious1.root");
-                       gSystem->Exec("cp SDDinjectHistos2.root SDDinjectHistosPrevious2.root");
-                       gSystem->Exec("cp SDDinjectHistos3.root SDDinjectHistosPrevious3.root");
-                       gSystem->Exec("cp SDDinjectHistos4.root SDDinjectHistosPrevious4.root");
-                       gSystem->Exec("cp SDDinjectHistos5.root SDDinjectHistosPrevious5.root");
-                       gSystem->Exec("cp SDDinjectHistos6.root SDDinjectHistosPrevious6.root");
+                       gSystem->Exec("cp SDDinjectHistos.root SDDinjectHistosPrevious.root");
                } else {
-                       AliInfo("file(s) SDDinjectHistos .root not found \n");
+                       AliInfo("file(s) SDDinjectHistos.root not found \n");
                }
        }
        fclose (fpin);
-/*
-       static Int_t injtimeLast = 0; 
-       FILE *fpinlast = fopen( "SDDinjectHistos.time", "r" );
-       if(fpinlast) {
-               fscanf(fpinlast,"%d",&injtimeLast);
-               fclose (fpinlast);
-       } else 
-               injtimeLast = 0;
-       Int_t injtimeCurrent = 0; 
-       gSystem->Exec("perl -e '@d=localtime ((stat(shift))[9]); printf \"%02d%02d%02d%02d%02d\n\", $d[5]-100,$d[4]+1,$d[3],$d[2],$d[1]'  SDDinjectHistos.root > SDDinjectHistos.time");
-       FILE *fpin = fopen( "SDDinjectHistos.time", "r" );
-       fscanf(fpin,"%d",&injtimeCurrent);
-       if(injtimeCurrent > injtimeLast) {
-               // new gain file found
-               injtimeLast = injtimeCurrent;
-
-               TFile injectFile("SDDinjectHistos.root");
-               if(!injectFile.IsZombie()) {
-                       AnalyseHistos(6); // Drift Speed
-                       gSystem->Exec("cp SDDinjectHistos.root SDDinjectHistosLast.root");
-               } else {
-                       AliInfo("file SDDinjectHistos.root not found \n");
-               }
-
-       }
-       fclose (fpin);
-*/
 //     delete fpin;
 }
 
@@ -884,68 +891,62 @@ void AliITSQASDDDataMakerRec::AnalyseINJ()
 void AliITSQASDDDataMakerRec::AnodeStatus()
 {
        char *hnamePrevious = new char[50];
-       char *fnamePrevious = new char[50];
-    fGoodAnodes = 0;
-
-       for(Int_t k=0;k<6;k++) {
-               sprintf(fnamePrevious,"SDDgainHistosPrevious%d.root",k+1);
-               TFile gainFilePrevious(fnamePrevious);
-               if(gainFilePrevious.IsZombie()) continue;
-               for(Int_t ddl =0; ddl<fDDLModuleMap->GetNDDLs(); ddl++){
-                       for(Int_t crx =0; crx<fDDLModuleMap->GetNModPerDDL(); crx++){
-                               for(Int_t iside=0;iside<fgknSide;iside++){
-                                       Int_t moduleSDD = fDDLModuleMap->GetModuleNumber(ddl,crx);
-                       //AliITSgeomTGeo::GetModuleId(moduleSDD+fgkmodoffset, lay, lad, det);
-                                       sprintf(hnamePrevious,"hgood%02dc%02ds%d",ddl,crx,iside);
-                               //AliInfo(Form("get histo %s\n",hnamePrevious));
-                                       TH1F *hgood = (TH1F *) gainFilePrevious.Get(hnamePrevious);
-                                       if(!hgood) continue;
-                                       for(Int_t i=0; i<hgood->GetNbinsX();i++) {
-                                               fAnodeMap[moduleSDD-fgkmodoffset][iside][i] = hgood->GetBinContent(i);
-                                               if(fAnodeMap[moduleSDD-fgkmodoffset][iside][i]) fGoodAnodes++;
-                                       }
-                                       delete hgood;
-                               }
-                       }
-               }
-               gainFilePrevious.Close();
+       fGoodAnodes = 0;
+
+               TFile basFilePrevious("SDDbasHistosPrevious.root");
+               if(!basFilePrevious.IsZombie()) {
+         for(Int_t ddl =0; ddl<fDDLModuleMap->GetNDDLs(); ddl++){
+                       for(Int_t crx =0; crx<fDDLModuleMap->GetNModPerDDL(); crx++){
+                               for(Int_t iside=0;iside<fgknSide;iside++){
+                                       Int_t moduleSDD = fDDLModuleMap->GetModuleNumber(ddl,crx);
+                       //AliITSgeomTGeo::GetModuleId(moduleSDD+fgkmodoffset, lay, lad, det);
+                                       sprintf(hnamePrevious,"hgood%02dc%02ds%d",ddl,crx,iside);
+                               //AliInfo(Form("get histo %s\n",hnamePrevious));
+                                       TH1F *hgood = (TH1F *) basFilePrevious.Get(hnamePrevious);
+                                       if(!hgood) continue;
+                                       for(Int_t i=0; i<hgood->GetNbinsX();i++) {
+                                               fkAnodeMap[moduleSDD-fgkmodoffset][iside][i] = hgood->GetBinContent(i);
+                                               if(fkAnodeMap[moduleSDD-fgkmodoffset][iside][i]) fGoodAnodes++;
+                                       }
+                                       delete hgood;
+                               }
+                       }
+         }
+         basFilePrevious.Close();
        }
-
        fGoodAnodesCurrent = 0;
        fBadAnodesCurrent = 0;
        char *hname = new char[50];
        Int_t nChangedStatus = 0;
        Bool_t CurrentAnodeMap[fgknSDDmodules][fgknSide][fgknAnode];    
-       for(Int_t k=0;k<6;k++) {
-               sprintf(fnamePrevious,"SDDgainHistos%d.root",k+1);
-               TFile gainFile(fnamePrevious);
-               if(gainFile.IsZombie()) continue;
-               for(Int_t ddl =0; ddl<fDDLModuleMap->GetNDDLs(); ddl++){
-                       for(Int_t crx =0; crx<fDDLModuleMap->GetNModPerDDL(); crx++){
-                               for(Int_t iside=0;iside<fgknSide;iside++){
-                                       Int_t moduleSDD = fDDLModuleMap->GetModuleNumber(ddl,crx);
-                               //AliITSgeomTGeo::GetModuleId(moduleSDD+fgkmodoffset, lay, lad, det);
-                                       sprintf(hname,"hgood%02dc%02ds%d",ddl,crx,iside);
-                               //AliInfo(Form("get histo %s\n",hname));
-                                       TH1F *hgood = (TH1F *) gainFile.Get(hname);
-                                       if(!hgood) continue;
-                                       for(Int_t i=0; i<hgood->GetNbinsX();i++) {
-                                               CurrentAnodeMap[moduleSDD-fgkmodoffset][iside][i] = hgood->GetBinContent(i);
-                                               if(CurrentAnodeMap[moduleSDD-fgkmodoffset][iside][i]) fGoodAnodesCurrent++;
-                                               else fBadAnodesCurrent++;
-                                               if(CurrentAnodeMap[moduleSDD-fgkmodoffset][iside][i] != fAnodeMap[moduleSDD-fgkmodoffset][iside][i]) {
-                                                       fAnodeMap[moduleSDD-fgkmodoffset][iside][i] = CurrentAnodeMap[moduleSDD-fgkmodoffset][iside][i];
-                                                       nChangedStatus++;
-                                                       AliWarning(Form("DDL %d, CRX %d, Side %d, Anode %d changed status to %d \n",ddl,crx,iside,i,fAnodeMap[moduleSDD-fgkmodoffset][iside][i]));
-                                               }
-                                       }
-                                       delete hgood;
-                               }
-                       }
-               }
-               gainFile.Close();
+       TFile basFile("SDDbasHistos.root");
+       if(!basFile.IsZombie()) {
+         for(Int_t ddl =0; ddl<fDDLModuleMap->GetNDDLs(); ddl++){
+                       for(Int_t crx =0; crx<fDDLModuleMap->GetNModPerDDL(); crx++){
+                               for(Int_t iside=0;iside<fgknSide;iside++){
+                                       Int_t moduleSDD = fDDLModuleMap->GetModuleNumber(ddl,crx);
+                               //AliITSgeomTGeo::GetModuleId(moduleSDD+fgkmodoffset, lay, lad, det);
+                                       sprintf(hname,"hgood%02dc%02ds%d",ddl,crx,iside);
+                               //AliInfo(Form("get histo %s\n",hname));
+                                       TH1F *hgood = (TH1F *) basFile.Get(hname);
+                                       if(!hgood) continue;
+                                       for(Int_t i=0; i<hgood->GetNbinsX();i++) {
+                                               CurrentAnodeMap[moduleSDD-fgkmodoffset][iside][i] = hgood->GetBinContent(i);
+                                               if(CurrentAnodeMap[moduleSDD-fgkmodoffset][iside][i]) fGoodAnodesCurrent++;
+                                               else fBadAnodesCurrent++;
+                                               if(CurrentAnodeMap[moduleSDD-fgkmodoffset][iside][i] != fkAnodeMap[moduleSDD-fgkmodoffset][iside][i]) {
+                                                       fkAnodeMap[moduleSDD-fgkmodoffset][iside][i] = CurrentAnodeMap[moduleSDD-fgkmodoffset][iside][i];
+                                                       nChangedStatus++;
+                                               //      AliWarning(Form("DDL %d, CRX %d, Side %d, Anode %d changed status to %d \n",ddl,crx,iside,i,fkAnodeMap[moduleSDD-fgkmodoffset][iside][i]));
+                                               }
+                                       }
+                                       delete hgood;
+                               }
+                       }
+         }
+         basFile.Close();
        }
-       
+
        AliWarning(Form("Number of good anodes changed from %d to %d, that is %f %%\n",fGoodAnodes,fGoodAnodesCurrent,((Float_t) TMath::Abs(fGoodAnodes-fGoodAnodesCurrent))/(fBadAnodesCurrent+fGoodAnodesCurrent)));
        if(fGoodAnodesCurrent != fGoodAnodes) {
                fGoodAnodes = fGoodAnodesCurrent;
@@ -962,20 +963,23 @@ void AliITSQASDDDataMakerRec::AnodeStatus()
 void AliITSQASDDDataMakerRec::AnalyseHistos(Int_t type)
 {
 
-       if(type < 1 || type > 6) AliWarning(Form("Wrong type (%d), must be between 1 and 6\n",type));
-       
+       if(type < 1 || type > 6) {
+         AliWarning(Form("Wrong type (%d), must be between 1 and 6\n",type));
+         return;
+       }
+
        Double_t Current[fgknSDDmodules][fgknSide][fgknAnode];  
        char *hnamePrevious = new char[50];
-       char *fnamePrevious = new char[50];
+       TString *fnamePrevious=NULL;
 
-       for(Int_t k=0; k<6; k++) {
-               if(type < 6) sprintf(fnamePrevious,"SDDgainHistosPrevious%d.root",k+1);
-               else sprintf(fnamePrevious,"SDDinjectHistosPrevious%d.root",k+1);
-               TFile *gainFilePrevious = new TFile(fnamePrevious);
-               if(gainFilePrevious->IsZombie()) continue;
+               if(type < 5) fnamePrevious = new TString("SDDbasHistosPrevious.root");
+               else if(type == 5) fnamePrevious = new TString("SDDgainHistosPrevious.root");
+               else if(type == 6) fnamePrevious = new TString("SDDinjectHistosPrevious.root");
+               TFile *gainFilePrevious = new TFile(fnamePrevious->Data());
+               if(!gainFilePrevious->IsZombie()) {
 
-               for(Int_t ddl =0; ddl<fDDLModuleMap->GetNDDLs(); ddl++){
-                       for(Int_t crx =0; crx<fDDLModuleMap->GetNModPerDDL(); crx++){
+                 for(Int_t ddl =0; ddl<fDDLModuleMap->GetNDDLs(); ddl++){
+                   for(Int_t crx =0; crx<fDDLModuleMap->GetNModPerDDL(); crx++){
                                for(Int_t iside=0;iside<fgknSide;iside++){
                                        Int_t moduleSDD = fDDLModuleMap->GetModuleNumber(ddl,crx);
                        //AliITSgeomTGeo::GetModuleId(moduleSDD+fgkmodoffset, lay, lad, det);
@@ -994,10 +998,11 @@ void AliITSQASDDDataMakerRec::AnalyseHistos(Int_t type)
                                        delete hhist;
                                }
                        }
+                 }
+                 gainFilePrevious->Close();
+                 delete gainFilePrevious;
                }
-               gainFilePrevious->Close();
-               delete gainFilePrevious;
-       }
+               delete fnamePrevious;
 
        Float_t xmin = 0.;
        Float_t xmax = 0;
@@ -1044,13 +1049,15 @@ void AliITSQASDDDataMakerRec::AnalyseHistos(Int_t type)
 
        Float_t binw = (xmax-xmin)/nbins;
 
-       for(Int_t k=0; k<6; k++) {
-               if(type < 6) sprintf(fnamePrevious,"SDDgainHistos%d.root",k+1);
-               else sprintf(fnamePrevious,"SDDinjectHistos%d.root",k+1);
-               TFile *gainFile = new TFile(fnamePrevious);
-               if(gainFile->IsZombie()) continue;
+       TString *fnamePrevious2=NULL;
 
-               for(Int_t ddl =0; ddl<fDDLModuleMap->GetNDDLs(); ddl++){
+               if(type < 5) fnamePrevious2 = new TString("SDDbasHistosPrevious.root");
+               else if(type == 5) fnamePrevious2 = new TString("SDDgainHistosPrevious.root");
+               else if(type == 6) fnamePrevious2 = new TString("SDDinjectHistosPrevious.root");
+               TFile *gainFile = new TFile(fnamePrevious2->Data());
+               if(!gainFile->IsZombie()) {
+
+                 for(Int_t ddl =0; ddl<fDDLModuleMap->GetNDDLs(); ddl++){
                        for(Int_t crx =0; crx<fDDLModuleMap->GetNModPerDDL(); crx++){
                                for(Int_t iside=0;iside<fgknSide;iside++){
                                        Int_t moduleSDD = fDDLModuleMap->GetModuleNumber(ddl,crx);
@@ -1065,19 +1072,19 @@ void AliITSQASDDDataMakerRec::AnalyseHistos(Int_t type)
                                        TH1F *hhist = (TH1F *) gainFile->Get(hnamePrevious);
                                        if(!hhist) continue;
                                        for(Int_t i=0; i<hhist->GetNbinsX();i++) {
-                                               if(!fAnodeMap[moduleSDD-fgkmodoffset][iside][i]) continue;
+                                               if(!fkAnodeMap[moduleSDD-fgkmodoffset][iside][i]) continue;
                                                hDist->Fill(hhist->GetBinContent(i));
                                                hDistDiff->Fill(hhist->GetBinContent(i)-Current[moduleSDD-fgkmodoffset][iside][i]);
                                        }
                                        delete hhist;
                                }
                        }
+                 }
+                 gainFile->Close();
+                 delete gainFile;
                }
-               gainFile->Close();
-               delete gainFile;
+               delete fnamePrevious2;
 
-       }
-       
        TF1 ff("ff", "gaus", xmin+0.1, xmax-0.1);
        hDist->Fit("ff","NWR");
 //     hDist->Fit("gaus","","",xmin+0.1, xmax-0.1);
@@ -1094,29 +1101,36 @@ void AliITSQASDDDataMakerRec::AnalyseHistos(Int_t type)
 //             else
 //                     if(TMath::Abs(i-mean) > 4*rms) badB += hDist->GetBinContent(i);
        }
+        Double_t denomi = hDist->GetEntries();
+        if(denomi == 0) {
+         denomi = 1;
+         badB = 0; 
+        } 
        if(type == 1) {
-               AliInfo(Form("Number of anodes with baseline out of 4*sigma from average: %d, %f%%\n",badB,100.*((Float_t) badB)/hDist->GetEntries()));
+               AliInfo(Form("Number of anodes with baseline out of 4*sigma from average: %d, %f%%\n",badB,100.*((Float_t) badB)/denomi));
        } else if(type == 2) {
-               AliInfo(Form("Number of anodes with uncorrected noise out of 4*sigma from average: %d, %f%%\n",badB,100.*((Float_t) badB)/hDist->GetEntries()));
+               AliInfo(Form("Number of anodes with uncorrected noise out of 4*sigma from average: %d, %f%%\n",badB,100.*((Float_t) badB)/denomi));
        } else if(type == 3) {
-               AliInfo(Form("Number of anodes with common mode noise out of 4*sigma from average: %d, %f%%\n",badB,100.*((Float_t) badB)/hDist->GetEntries()));
+               AliInfo(Form("Number of anodes with common mode noise out of 4*sigma from average: %d, %f%%\n",badB,100.*((Float_t) badB)/denomi));
        } else if(type == 4) {
-               AliInfo(Form("Number of anodes with corrected noise out of 4*sigma from average: %d, %f%%\n",badB,100.*((Float_t) badB)/hDist->GetEntries()));
+               AliInfo(Form("Number of anodes with corrected noise out of 4*sigma from average: %d, %f%%\n",badB,100.*((Float_t) badB)/denomi));
        } else if(type == 5) {
-               AliInfo(Form("Number of anodes with gain out of 4*sigma from average: %d, %f%%\n",badB,100.*((Float_t) badB)/hDist->GetEntries()));
+               AliInfo(Form("Number of anodes with gain out of 4*sigma from average: %d, %f%%\n",badB,100.*((Float_t) badB)/denomi));
        } else if(type == 6) {
                Int_t badspeed = (Int_t)hDist->GetBinContent(1);
                AliInfo(Form("Number of anodes with drift speed equal to 0: %d\n",badspeed));
-               AliInfo(Form("Number of anodes with drift speed out of 4*sigma from average: %d, %f%%\n",badB-badspeed,100.*((Float_t) (badB-badspeed))/(hDist->GetEntries()-badspeed)));
+               AliInfo(Form("Number of anodes with drift speed out of 4*sigma from average: %d, %f%%\n",badB-badspeed,100.*((Float_t) (badB-badspeed))/(denomi-badspeed)));
        }
        
        TH1F *hDistHistoryCurrent = NULL;
        TH1F *hDistHistoryPrevious = NULL;
 
-       TFile *gainHistoryFile;
-       if(type < 6) 
+       TFile *gainHistoryFile=NULL;
+       if(type < 5) 
+               gainHistoryFile = new TFile("SDDbasHistory.root","UPDATE");
+       else if(type ==5) 
                gainHistoryFile = new TFile("SDDgainHistory.root","UPDATE");
-       else
+       else if(type == 6)
                gainHistoryFile = new TFile("SDDinjectHistory.root","UPDATE");
        hDist->Write();
        hDistDiff->Write();
@@ -1131,12 +1145,12 @@ void AliITSQASDDDataMakerRec::AnalyseHistos(Int_t type)
                //AliInfo(Form("hDistHistoryPrevious %x\n",hDistHistoryPrevious));
        
                if(!hDistHistoryPrevious) {
-                       if(type == 1) hDistHistoryCurrent = new TH1F("hBaselineHistory","Average Baseline History",1,0,1);
-                       else if(type == 2) hDistHistoryCurrent = new TH1F("hNoiseUncHistory","Average Uncorrected Noise History",1,0,1);
-                       else if(type == 3) hDistHistoryCurrent = new TH1F("hNoiseCMNHistory","Average Common Mode Noise History",1,0,1);
-                       else if(type == 4) hDistHistoryCurrent = new TH1F("hNoiseCorHistory","Average Corrected Noise History",1,0,1);
-                       else if(type == 5) hDistHistoryCurrent = new TH1F("hGainHistory","Average Gain History",1,0,1);
-                       else if(type == 6) hDistHistoryCurrent = new TH1F("hDriftSpeedHistory","Average Drift Speed History",1,0,1);
+                       if(type == 1) hDistHistoryCurrent = new TH1F("hBaselineHistory","Average Baseline History",2,0,2);
+                       else if(type == 2) hDistHistoryCurrent = new TH1F("hNoiseUncHistory","Average Uncorrected Noise History",2,0,2);
+                       else if(type == 3) hDistHistoryCurrent = new TH1F("hNoiseCMNHistory","Average Common Mode Noise History",2,0,2);
+                       else if(type == 4) hDistHistoryCurrent = new TH1F("hNoiseCorHistory","Average Corrected Noise History",2,0,2);
+                       else if(type == 5) hDistHistoryCurrent = new TH1F("hGainHistory","Average Gain History",2,0,2);
+                       else if(type == 6) hDistHistoryCurrent = new TH1F("hDriftSpeedHistory","Average Drift Speed History",2,0,2);
                        //AliInfo(Form("hDistHistoryCurrent 1 %x\n",hDistHistoryCurrent));
 //                     if(type < 6) {
                                hDistHistoryCurrent->SetBinContent(1,average);
@@ -1169,5 +1183,30 @@ void AliITSQASDDDataMakerRec::AnalyseHistos(Int_t type)
 //     delete hname;
        delete hDist;
        delete hDistDiff;
-}//_______________________________________________________________
+//        if(hDistHistoryCurrent) delete hDistHistoryCurrent;
+//     if(hDistHistoryPrevious) delete hDistHistoryPrevious;
+}
+
+//_______________________________________________________________
 
+
+void AliITSQASDDDataMakerRec::CreateTheMap()
+{
+
+  AliCDBEntry *ddlMapSDD = AliCDBManager::Instance()->Get("ITS/Calib/DDLMapSDD");
+  Bool_t cacheStatus = AliCDBManager::Instance()->GetCacheFlag();
+  if(!ddlMapSDD)
+    {
+      AliError("Calibration object retrieval failed! SDD will not be processed");
+      fDDLModuleMap = NULL;
+      //return rv;
+    }
+  fDDLModuleMap = (AliITSDDLModuleMapSDD*)ddlMapSDD->GetObject();
+  if(!cacheStatus)ddlMapSDD->SetObject(NULL);
+  ddlMapSDD->SetOwner(kTRUE);
+  if(!cacheStatus)
+    {
+      delete ddlMapSDD;
+    }
+  AliInfo("DDL Map Created\n ");
+}