]> git.uio.no Git - u/mrichter/AliRoot.git/blobdiff - T0/AliT0QADataMakerRec.cxx
DQM shifter histos based only on physics data
[u/mrichter/AliRoot.git] / T0 / AliT0QADataMakerRec.cxx
index 871279120321db9bd3d7099e848afb401706b307..2d881fdad82f525436eb0d57f53f843ca8fcb08d 100644 (file)
 #include <TH1F.h> 
 #include <TH2F.h> 
 #include <TDirectory.h>
+#include <TMath.h>
 // --- Standard library ---
 
 // --- AliRoot header files ---
+
 #include "AliESDEvent.h"
 #include "AliLog.h"
 #include "AliT0digit.h" 
 #include "AliQAChecker.h"
 #include "AliT0RawReader.h"
 #include "AliT0RecoParam.h"
+#include "AliQAThresholds.h"
+#include "AliDAQ.h"
+#include "AliCDBEntry.h"
+#include "AliQAManager.h"
+#include "THnSparse.h"
+
+#include "TFitResultPtr.h"
 
 #include "Riostream.h"
 ClassImp(AliT0QADataMakerRec)
@@ -47,37 +56,47 @@ ClassImp(AliT0QADataMakerRec)
   AliT0QADataMakerRec::AliT0QADataMakerRec() : 
 AliQADataMakerRec(AliQAv1::GetDetName(AliQAv1::kT0), 
                  "T0 Quality Assurance Data Maker"),
-  fnEventCal(0),
-  fnEventPhys(0)
-
+    fMeanRawVertexParam(0),
+    fMeanORAParam(0),
+    fMeanORCParam(0),
+    fCFDEffSubRangeLowParam(0),
+    fCFDEffSubRangeHighParam(3000),
+    fLEDEffSubRangeLowParam(0),
+    fLEDEffSubRangeHighParam(3000)
+//  fnEventCal(0),
+//  fnEventPhys(0)
 {
   // ctor
-  for (Int_t i=0; i<6; i++) {
-    fNumTriggers[i]=0;
-    fNumTriggersCal[i]=0;
-    fTrEffCal[i] = 0;
-    fTrEffPhys[i] = 0;
-
+  // RS: There is some inconsistency here: the separation of physics and calib. events/histos is done by
+  // fEventSpecie. Why do we book separate histos on different slots for calib and physics ? 
+  // I am changing this in such way that we don't need local counters like fNumTriggers (the corresponding
+  // histos now incremented in the MakeRaws, and for the normalization I will use the framework's counters
+  // AliQADataMaker::GetEvCountCycle(...), AliQADataMaker::GetEvCountTotal(...)
+  // All these fTrEff.. feff.. will by directly filled in corresponding histos
+
+  for(Int_t i=0; i<24; i++){
+    fMeanCFDFromGoodRunParam[i]=0; 
   }
-  for (Int_t i=0; i<24; i++)
-    {
-      feffC[i]=0;
-      feffA[i]=0;
-      feffqtc[i]=0;
-   }
 }
 
+
 //____________________________________________________________________________ 
 AliT0QADataMakerRec::AliT0QADataMakerRec(const AliT0QADataMakerRec& qadm) :
   AliQADataMakerRec(),
-  fnEventCal(0),
-  fnEventPhys(0)
-
-  
+  fMeanRawVertexParam(qadm.fMeanRawVertexParam),
+  fMeanORAParam(qadm.fMeanORAParam),
+  fMeanORCParam(qadm.fMeanORCParam),
+  fCFDEffSubRangeLowParam(qadm.fCFDEffSubRangeLowParam),
+  fCFDEffSubRangeHighParam(qadm.fCFDEffSubRangeHighParam),
+  fLEDEffSubRangeLowParam(qadm.fLEDEffSubRangeLowParam),
+  fLEDEffSubRangeHighParam(qadm.fLEDEffSubRangeHighParam)
 {
   //copy ctor 
- SetName((const char*)qadm.GetName()) ; 
-  SetTitle((const char*)qadm.GetTitle()); 
+  SetName((const char*)qadm.GetName()) ; 
+  SetTitle((const char*)qadm.GetTitle());
+  for(Int_t i=0; i<24; i++){
+    fMeanCFDFromGoodRunParam[i]=qadm.fMeanCFDFromGoodRunParam[i]; 
+  }
 }
 
 //__________________________________________________________________
@@ -88,75 +107,173 @@ AliT0QADataMakerRec& AliT0QADataMakerRec::operator = (const AliT0QADataMakerRec&
   new(this) AliT0QADataMakerRec(qadm);
   return *this;
 }
+//__________________________________________________________________
+AliT0QADataMakerRec::~AliT0QADataMakerRec()
+{
+  //destructor
+}
 //____________________________________________________________________________
 void AliT0QADataMakerRec::EndOfDetectorCycle(AliQAv1::TASKINDEX_t task, TObjArray ** list)
 {
   //Detector specific actions at end of cycle
   // do the QA checking
-  AliQAChecker::Instance()->Run(AliQAv1::kT0, task, list) ;
+  AliInfo(Form("Task: %d",task));
+  ResetEventTrigClasses();
   
+  TH1* hcounter = 0;
+  TH1* heff = 0;
+  TH1* htmp = 0;
+  TH1F* hEventCounter=NULL;
   for (Int_t specie = 0 ; specie < AliRecoParam::kNSpecies ; specie++) {
-    if (! IsValidEventSpecie(specie, list)) 
-      continue ;
-    SetEventSpecie(AliRecoParam::ConvertIndex(specie)) ; 
-    if ( task == AliQAv1::kRAWS ) {
-      GetRawsData(0)->SetLabelSize(0.02);
-      const Char_t *triggers[6] = {"mean", "vertex","ORA","ORC","central","semi-central"};
-      for (Int_t itr=0; itr<6; itr++) {
-       if ( fnEventCal>0) 
-         fTrEffCal[itr] = Float_t (fNumTriggersCal[itr])/Float_t (fnEventCal);
-       if ( fnEventPhys>0) 
-         fTrEffPhys[itr] = Float_t (fNumTriggers[itr])/Float_t (fnEventPhys);
-
-        GetRawsData(420)->Fill(triggers[itr], fTrEffCal[itr]);
-        GetRawsData(420)->SetBinContent(itr+1, fTrEffCal[itr]);
-        GetRawsData(97)->Fill(triggers[itr], fTrEffPhys[itr]);
-        GetRawsData(97)->SetBinContent(itr+1, fTrEffPhys[itr]);
-      } 
-      Float_t effic=0;
-      for(Int_t ik=0; ik<24; ik++)
-       {  
-         effic=0;
-         if ( fnEventCal>0) effic = Float_t(feffC[ik])/Float_t(fnEventCal);
-         GetRawsData(205)->SetBinContent(ik+1,effic) ;
-         effic=0;
-         if ( fnEventCal>0) effic = Float_t(feffA[ik])/Float_t(fnEventCal);
-         GetRawsData(206)->SetBinContent(ik+1,effic );
-         effic=0;
-         if ( fnEventCal>0) effic = Float_t(feffqtc[ik])/Float_t(fnEventCal);
-         GetRawsData(207)->SetBinContent(ik+1, effic);
-       }
-      
-      
-    }
-    
-  }
-
+    //
+    // RS: There is some inconsistency here: the separation of physics and calib. events/histos is done by
+    // fEventSpecie. Why do we book separate histos on different slots for calib and physics ? 
+    // I am changing this in such way that we don't need local counters like fNumTriggers (the corresponding
+    // histos now incremented in the MakeRaws, and for the normalization I will use the framework's counters
+    // AliQADataMaker::GetEvCountCycle(...), AliQADataMaker::GetEvCountTotal(...)
+    //
+    // I think the histos xx+250 should be suppressed (the xx calib histos of specie==calibration will be 
+    // used automatically)
+    //
+    if (! IsValidEventSpecie(specie, list)) continue;
+    SetEventSpecie(AliRecoParam::ConvertIndex(specie));
+    //
+    for (int itc=-1;itc<GetNTrigClasses();itc++) { // RS: loop over eventual clones per trigger class
+      // 
+      if ( task == AliQAv1::kRAWS ) {
+       //
+       float nEvent = GetEvCountCycleRaws(itc);   // counted events for given trigger class
+       if(nEvent>0) { 
+          Float_t numberOfEventsAllCycles = 0.0;
+          if((hEventCounter=(TH1F*) GetRawsData(240,itc))){
+            numberOfEventsAllCycles = hEventCounter->Integral() + nEvent;// count all events upto now
+            hEventCounter->SetBinContent(1,numberOfEventsAllCycles); // increase counter 
+          } 
+
+          SetEfficiency(169, 241, itc, numberOfEventsAllCycles);
+          SetEfficiency(207, 242, itc, numberOfEventsAllCycles);
+          SetEfficiency(208, 243, itc, numberOfEventsAllCycles);
+          SetEfficiency(237, 244, itc, numberOfEventsAllCycles);
+          SetEfficiency(238, 245, itc, numberOfEventsAllCycles);
+
+
+          //fk// orA and orC for given specie and trigger class
+          Float_t  numberOfORAEndOfCycle = 0.0;
+          Float_t  numberOfORCEndOfCycle = 0.0;
+         if((htmp=GetRawsData(172,itc))) numberOfORAEndOfCycle = htmp->Integral(); //ORA     
+         if((htmp=GetRawsData(173,itc))) numberOfORCEndOfCycle = htmp->Integral(); //ORC     
+          
+          if((heff=GetRawsData(209,itc))){ //QTC efficiency
+            if((hcounter=GetRawsData(246,itc))){ //QTC counter
+              if(numberOfORCEndOfCycle>0){
+                for(int ipmt=0; ipmt<12; ipmt++){
+                  Float_t val = hcounter->GetBinContent(ipmt+1); //first bin has consequtive number 1 
+                  heff->SetBinContent(ipmt+1,val/numberOfORCEndOfCycle);
+                                 
+               }
+              }else{
+                for(int ipmt=0;ipmt<12; ipmt++)
+                   heff->SetBinContent(ipmt+1,0);
+              }
+              if(numberOfORAEndOfCycle>0){
+                for(int ipmt=12;ipmt<24; ipmt++){
+                  Float_t val = hcounter->GetBinContent(ipmt+1);
+                  heff->SetBinContent(ipmt+1,val/numberOfORAEndOfCycle);
+                }
+              }else{
+                for(int ipmt=0;ipmt<12; ipmt++)
+                  heff->SetBinContent(ipmt+1,0);
+              }
+            }
+          }
+       }//Evt >0
+      } // kRAWS
+    } // RS: loop over eventual clones per trigger class
+  } // loop over species
+  //
+  AliQAChecker::Instance()->Run(AliQAv1::kT0, task, list); //FK
 }
+
+
 //____________________________________________________________________________
 void AliT0QADataMakerRec::StartOfDetectorCycle()
 {
   //Detector specific actions at start of cycle
+  AliCDBManager* man = AliCDBManager::Instance();
+  //man->SetDefaultStorage(gSystem->Getenv("AMORE_CDB_URI"));
+  if(!man) return; 
+  AliCDBEntry* entry = man->Get("GRP/Calib/QAThresholds");
+  TObjArray* t0branch = (TObjArray*) entry->GetObject();
+  AliQAThresholds*  thresholds = (AliQAThresholds*) t0branch->FindObject("T00");
+  // here you should test that you got a non-null pointer
+
+
+if(!thresholds) return;
+  if(AliDAQ::DetectorID("T0")!= thresholds->GetDetectorId()){
+    AliInfo(Form("DETECTOR ID %d DOES NOT MATCH TO TZERO",thresholds->GetDetectorId()));
+    return;
+  }
+  
+  int iparam = 0; 
+  if((TParameter<float>*) thresholds->GetThreshold(iparam)){ // mean raw vertex 
+    fMeanRawVertexParam = ((TParameter<float>*) thresholds->GetThreshold(iparam))->GetVal();
+  }
 
+  iparam = 76; 
+  if((TParameter<float>*) thresholds->GetThreshold(iparam)){ // mean raw vertex 
+    fMeanORAParam = ((TParameter<float>*) thresholds->GetThreshold(iparam))->GetVal();
+  } 
+  iparam = 77; 
+  if((TParameter<float>*) thresholds->GetThreshold(iparam)){ // mean raw vertex 
+    fMeanORCParam = ((TParameter<float>*) thresholds->GetThreshold(iparam))->GetVal();
+  } 
+  iparam = 78; 
+  if((TParameter<float>*) thresholds->GetThreshold(iparam)){ // mean raw vertex 
+    fCFDEffSubRangeLowParam = ((TParameter<float>*) thresholds->GetThreshold(iparam))->GetVal();
+  } 
+  iparam = 79; 
+  if((TParameter<float>*) thresholds->GetThreshold(iparam)){ // mean raw vertex 
+    fCFDEffSubRangeHighParam = ((TParameter<float>*) thresholds->GetThreshold(iparam))->GetVal();
+  } 
+    
+  iparam = 80; 
+  if((TParameter<float>*) thresholds->GetThreshold(iparam)){ // mean raw vertex 
+    fLEDEffSubRangeLowParam = ((TParameter<float>*) thresholds->GetThreshold(iparam))->GetVal();
+  } 
+    
+  iparam = 81; 
+  if((TParameter<float>*) thresholds->GetThreshold(iparam)){ // mean raw vertex 
+    fLEDEffSubRangeHighParam = ((TParameter<float>*) thresholds->GetThreshold(iparam))->GetVal();
+  } 
 
+  for(int ipmt=0; ipmt<24;ipmt++){ 
+    iparam = ipmt + 1; //current consecutive number of parameter
+    if((TParameter<float>*) thresholds->GetThreshold(iparam)){ // mean CFD from a good run 
+      fMeanCFDFromGoodRunParam[ipmt] = ((TParameter<float>*) thresholds->GetThreshold(iparam))->GetVal();
+    }
+  }
 }
  
 //____________________________________________________________________________ 
 void AliT0QADataMakerRec::InitRaws()
 {
+
   // create Raw histograms in Raw subdir
   const Bool_t expert   = kTRUE ; 
   const Bool_t saveCorr = kTRUE ; 
   const Bool_t image    = kTRUE ; 
   Float_t low[500];
   Float_t high[500];
-
+  //triggers
+  const Char_t *triggers[6] = {"T0 OR", "vertex","ORA","ORC","central","semi-central"};
+   
   
   for (Int_t i=0; i<500; i++){
-    //    low[i]  = GetRecoParam()->GetLow(i);
-    ///   high[i]  = GetRecoParam()->GetHigh(i);
-    low[i] = -5000;
-    high[i] = 20000;
+    low[i] = 0;
+    high[i] = 30000;
 
   }
 
@@ -165,21 +282,21 @@ void AliT0QADataMakerRec::InitRaws()
   TString qt1name, qt0name, qt1Calname, qt0Calname;
   TString nhits;
 
-  TH1F* fhRefPoint = new TH1F("hRefPoint","Ref Point",high[0]-low[0],low[0],high[0]);
-  Add2RawsList( fhRefPoint,0, expert, !image, !saveCorr);
-   
-  TH1F *fhRawCFD[24]; TH1F * fhRawLEDamp[24];
-  TH1F *fhRawQTC[24]; TH1F * fhRawLED[24];
-  TH1F *fhRawCFDcal[24]; TH1F * fhRawLEDampcal[24]; 
-  TH1F *fhRawCFDcalpmt[24];  
-  TH1F *fhRawCFDpmt[24];
-  TH1F *fhRawQTCcal[24];  TH1F * fhRawLEDcal[24];
-  TH1F *fhRawQT0cal[24]; TH1F *fhRawQT1cal[24];
-  TH1F *fhRawQT1[24]; TH1F *fhRawQT0[24];
-  TH1F* fhRawNhits[24];
-  
-  for (Int_t i=0; i<24; i++)
-    {
+  TH1F* hRefPoint = new TH1F("hRefPoint","Ref Point", 10000, 0 ,50000);
+  hRefPoint->SetLabelSize(0.02);
+  Add2RawsList( hRefPoint,0, expert, !image, !saveCorr);
+
+  TH1F *hRefPointcal = new TH1F("hRefPointcal","Ref Point laser", 5000, 0 ,20000);
+  Add2RawsList( hRefPointcal,250, expert, !image, !saveCorr);
+
+  TH1F *hRawCFD[24]; 
+  TH1F *hRawLEDamp[24];
+  TH1F *hRawQTC[24]; TH1F *hRawLED[24];
+  TH1F *hRawQT1[24]; TH1F *hRawQT0[24];
+  TH1F* hRawNhits[24];
+  for(Int_t i=0; i<24; i++){
+    
       timename ="hRawCFD";
       ledname = "hRawLED";
       qtcname = "hRawQTC";
@@ -194,172 +311,227 @@ void AliT0QADataMakerRec::InitRaws()
       qt1name += i+1;
       ledname += i+1;
       nhits   += i+1;
-      fhRawCFD[i] = new TH1F(timename.Data(), Form("%s;CFD [#channels];Counts", timename.Data()),high[i+1]-low[i+1],low[i+1],high[i+1]);
-        Add2RawsList( fhRawCFD[i],i+1, expert, !image, !saveCorr);
-      fhRawLED[i] = new TH1F(ledname.Data(),  Form("%s;LED[#channels];Counts", ledname.Data()),high[i+24+1]-low[i+24+1],low[i+24+1],high[i]);
-      Add2RawsList( fhRawLED[i],i+24+1, expert, !image, !saveCorr);
-      fhRawLEDamp[i] = new TH1F(ampname.Data(),  Form("%s;LED-CFD [#channels];Counts", ampname.Data()),1000,0,1000);
-     Add2RawsList( fhRawLEDamp[i],i+48+1, expert, !image, !saveCorr);
-      fhRawQTC[i] = new TH1F(qtcname.Data(),  Form("%s;QTC[#channels];Counts", qtcname.Data()),10000,0,10000);
-      Add2RawsList( fhRawQTC[i],i+72+1, expert, !image, !saveCorr);
-      fhRawQT1[i] = new TH1F(qt1name.Data(),  Form("%s;QT1[#channels];Counts", qtcname.Data()),high[270+i]-low[270+i],low[270+i],high[270+i]);
-       Add2RawsList( fhRawQT1[i],270+i, expert, !image, !saveCorr);
-      fhRawQT0[i] = new TH1F(qt0name.Data(),  Form("%s;QT0[#channels];Counts", qtcname.Data()),high[270+24+i]-low[270+24+i],low[270+24+i],high[270+24+i]);
-     Add2RawsList( fhRawQT0[i],270+24+i, expert, !image, !saveCorr);
-
-      fhRawNhits[i] = new TH1F(nhits.Data(),  Form("%s;#Hits;Events", nhits.Data()),10, 0, 10);
-     Add2RawsList( fhRawNhits[i],244+i, expert, !image, !saveCorr);
-
-    }
-  TH1F* fhRawTrigger = new TH1F("hRawTrigger"," phys triggers;Trigger #;Counts",5,0,5);
-  Add2RawsList(fhRawTrigger ,97, expert, !image, !saveCorr);
-
-  TH1F* fhRawMean = new TH1F("hRawMean","online mean signal, physics event;",high[98]-low[98],low[98],high[98]);
-  Add2RawsList( fhRawMean,98, expert, !image, !saveCorr);
-
-  TH1F* fhRawVertex = new TH1F("hRawVertex","online vertex signal; counts",high[100]-low[99],low[99],high[99]);
-  Add2RawsList( fhRawVertex,99, expert, !image, !saveCorr);
-
-  TH1F* fhRawORA = new TH1F("hRawORA","online OR A; counts", high[100]-low[100],low[100],high[100]);
-  Add2RawsList( fhRawORA,100, expert, !image, !saveCorr);
-  TH1F* fhRawORC = new TH1F("hRawORC","online OR C;counts", high[101]-low[101],low[101],high[101]);
-  Add2RawsList( fhRawORC,101, expert, !image, !saveCorr);
-
-
-  for (Int_t i=0; i<24; i++)
-    {
-      // for events with trigger CALIBRATION_EVENT
-      timeCalname ="hRawCFDcal";
-      ledCalname = "hRawLEDcal";
-      ampCalname = "hRawLEDminCFDcal";
-      qtcCalname = "hRawQTCcal";
-      qt0Calname = "hRawQT0cal";
-      qt1Calname = "hRawQT1cal";
-      timeCalname += i+1;
-      ledCalname += i+1;
-      ampCalname += i+1;
-      qtcCalname += i+1;
-      qt0Calname += i+1;
-      qt1Calname += i+1;
-      fhRawCFDcal[i] = new TH1F(timeCalname.Data(),  Form("%s;Time ;Counts", timeCalname.Data()),high[101+i+1]-low[101+i+1],low[101+i+1],high[101+i+1]);
-      Add2RawsList( fhRawCFDcal[i],101+i+1, expert, !image, !saveCorr);
-     fhRawLEDcal[i] = new TH1F(ledCalname.Data(),  Form("%s;Time ;Counts", ledCalname.Data()),high[101+i+24+1]-low[101+i+24+1],low[101+i+24+1],high[101+i+24+1]);
-      Add2RawsList( fhRawLEDcal[i],101+i+24+1, expert, !image, !saveCorr);
-
-      fhRawLEDampcal[i] = new TH1F(ampCalname.Data(), Form("%s;Amplitude [ADC counts];Counts", ampCalname.Data()),1000,0,1000);
-      Add2RawsList( fhRawLEDampcal[i],101+i+48+1, expert, !image, !saveCorr);
-
-      fhRawQTCcal[i] = new TH1F(qtcCalname.Data(), Form("%s;Charge ;Counts",qtcCalname.Data()),10000,0,10000);
-      Add2RawsList( fhRawQTCcal[i],101+i+72+1, expert, !image, !saveCorr);
-
-      fhRawQT0cal[i] = new TH1F(qt0Calname.Data(), Form("%s;Charge ;Counts",qt0Calname.Data()),high[371+i]-low[371+i],low[371+i],high[371+i]);
-      Add2RawsList( fhRawQT0cal[i],371+i, expert, !image, !saveCorr);
-
-      fhRawQT1cal[i] = new TH1F(qt1Calname.Data(), Form("%s;Charge ;Counts",qt1Calname.Data()),high[i+371+24]-low[i+371+24],low[i+371+24],high[i+371+24]);
-      Add2RawsList( fhRawQT1cal[i],i+371+24, expert, !image, !saveCorr);
+      hRawCFD[i] = new TH1F(timename.Data(), Form("%s;CFD [#channels]; Counts", timename.Data()),Int_t((high[i+1]-low[i+1])/4),low[i+1],high[i+1]);
+      //      ForbidCloning(hRawCFD[i]);       //RS I don't know how histos 1-24 should be processed in MakeRaws, for the moment forbidding the cloning
+      Add2RawsList( hRawCFD[i],i+1, expert, !image, !saveCorr);
+      hRawLED[i] = new TH1F(ledname.Data(),  Form("%s;LED [#channels]; Counts", ledname.Data()),Int_t((high[i+25]-low[i+25])/4),low[i+25],high[i+25]);
+      Add2RawsList( hRawLED[i],i+25, expert, !image, !saveCorr);
+      hRawLEDamp[i] = new TH1F(ampname.Data(),  Form("%s;LED-CFD [#channels]; Counts", ampname.Data()),1000,0,1000);
+      Add2RawsList( hRawLEDamp[i],i+49, expert, !image, !saveCorr);
+      hRawQTC[i] = new TH1F(qtcname.Data(),  Form("%s;QTC[#channels]; Counts", qtcname.Data()), 2500,0,10000); //fk
+      //QT0
+      Add2RawsList( hRawQTC[i],i+73, expert, !image, !saveCorr);
+      hRawQT0[i] = new TH1F(qt0name.Data(),  Form("%s; QT0 [#channels]; Counts", qt0name.Data()),Int_t((high[97+i]-low[97+i])/4),low[97+i],high[97+i]);
+      Add2RawsList( hRawQT0[i],97+i, expert, !image, !saveCorr);
+      //QT1
+      hRawQT1[i] = new TH1F(qt1name.Data(),  Form("%s; QT1 [#channels]; Counts", qt1name.Data()),Int_t((high[121+i]-low[121+i])/4),low[121+i],high[121+i]);
+      Add2RawsList( hRawQT1[i],121+i, expert, !image, !saveCorr);
+      
+      hRawNhits[i] = new TH1F(nhits.Data(),  Form("%s;#Hits;Events", nhits.Data()),20, 0, 20);
+      Add2RawsList( hRawNhits[i],176+i, expert, !image, !saveCorr);
+  }
+  
+      
+  TH1F* hRawTrigger = new TH1F("hRawTrigger"," triggers;Trigger ;Counts",6,0,6);
+  for (Int_t itr=0; itr<6; itr++) hRawTrigger->Fill(triggers[itr], 0); // RS Modified to allow cloning (no fNumTriggers member anymore)
+  Add2RawsList(hRawTrigger ,169, !expert, image, !saveCorr);
+  TH1F* hRawMean = new TH1F("hRawMean","online timer mean signal, physics event;",Int_t((high[170]-low[170])/4),low[170],high[170]);
+  Add2RawsList( hRawMean,170, expert, !image, !saveCorr);
+
+  TH1F* hRawVertex = new TH1F("hRawVertex","online 0TVX vertex signal; counts",Int_t((high[171]-low[171])/4),low[171],high[171]);
+  Add2RawsList( hRawVertex,171, expert, !image, !saveCorr);//FK
+
+  TH1F* hRawORA = new TH1F("hRawORA","online OR A; counts",Int_t((high[172]-low[172])/4),low[172],high[172]);
+  Add2RawsList( hRawORA,172, expert, !image, !saveCorr);
+  TH1F* hRawORC = new TH1F("hRawORC","online OR C;counts",Int_t(( high[173]-low[173])/4),low[173],high[173]);
+  Add2RawsList( hRawORC,173, expert, !image, !saveCorr);
+  TH1F* hMultCentr = new TH1F("hMultCentr","online trigger Central;counts ",Int_t(( high[174]-low[174])/4),low[174],high[174]);
+  Add2RawsList( hMultCentr,174, expert, !image, !saveCorr);
+  TH1F* hMultSeCentr = new TH1F("hMultSemiCentr","online trigger SemiCentral;counts ",Int_t(( high[175]-low[175])/4),low[175],high[175]);
+  Add2RawsList( hMultSeCentr,175, expert, !image, !saveCorr);
+
+  TH1F* hMultA = new TH1F("hMultA","full mulltiplicity A side;Multiplicity;Entries", Int_t((high[201]-low[201])/4) ,low[201],high[201]);
+  Add2RawsList( hMultA,201, expert, !image, !saveCorr );//FK
+  
+  TH1F* hMultAS = new TH1F("hMultASemi","full multiplicity with semi-central trigger A side ;Multiplicity;Entries",
+                           Int_t((high[202]-low[202])/4),low[202],high[202] );
+  Add2RawsList( hMultAS, 202, expert, !image, !saveCorr);
+  TH1F* hMultAC = new TH1F("hMultACentr","full multiplicity with central trigger;Multiplicity;Entries", 
+                           Int_t((high[203]-low[203])/4),low[203],high[203]);
+  Add2RawsList( hMultAC, 203, expert, !image, !saveCorr);
+  
+  
+  //side C
+   TH1F* hMultC = new TH1F("hMultC","full mulltiplicity C side;Multiplicity;Entries", Int_t(high[204]-low[204]/4) ,low[204],high[204]);
+  Add2RawsList( hMultC,204, expert, !image, !saveCorr );//FK
+  TH1F* hMultCS = new TH1F("hMultCSemi","full multiplicity with semi-central trigger C side;Multiplicity;Entries",
+                           Int_t((high[205]-low[205])/4),low[205],high[205] );
+  Add2RawsList( hMultCS,205, expert, !image, !saveCorr);
+  TH1F* hMultCC = new TH1F("hMultCCentr","full multiplicity with central trigger C side;Multiplicity;Entries", 
+                           Int_t((high[206]-low[206])/4),low[206],high[206]);
+  Add2RawsList( hMultCC,206, expert, !image, !saveCorr);
+  
+  
+  //efficiency
+  TH1F* hCFDeff= new TH1F("hCFDeff"," CFD efficiency; #PMT; #CFD counts/nEvents",24, 0 ,24);  
+  hCFDeff->SetMinimum(0);
+  hCFDeff->SetMaximum(2);
+  hCFDeff->SetMarkerStyle(20);//fk
+  hCFDeff->SetMarkerColor(2);//fk
+  hCFDeff->SetOption("p");//fk
+  Add2RawsList( hCFDeff, 207, expert, image, !saveCorr);//FK   
+  TH1F* hEffLED = new TH1F("hEffLED","LED efficiency; #PMT; #LED counts/nEvent",24, 0 ,24);
+  hEffLED ->SetMinimum(0);
+  hEffLED->SetMaximum(2);
+  hEffLED->SetMarkerStyle(28);//fk
+  hEffLED->SetMarkerColor(1);//fk
+  hEffLED->SetOption("p,same");//fk
+  Add2RawsList( hEffLED, 208, expert, !image, !saveCorr);//FK is published attahced to the CFD efficiency 
+  
+  TH1F* hEffQTC = new TH1F("hEffQTC","QTC efficiency; #PMT; QTC efficiency%s;",24, 0 ,24);
+  hEffQTC->SetMinimum(0);
+  hEffQTC->SetMaximum(2);
+  Add2RawsList( hEffQTC,209, !expert, image, !saveCorr);
+   
+  TH2F* hCFD = new TH2F("hCFD","CFD ; #PMT; CFD {#channnels}", 24, 0 , 24,Int_t((high[210]-low[210])/4),low[210],high[210]);
+  hCFD->SetOption("COLZ");
+  Add2RawsList( hCFD,210, expert, !image, !saveCorr);//fk
+    
+  TH2F* hLED = new TH2F("hLED","LED ; #PMT; LED [#channnels]", 24, 0 , 24,Int_t((high[211]-low[211])/4),low[211],high[211]);
+  hLED->SetOption("COLZ");
+  Add2RawsList( hLED,211, expert, !image, !saveCorr);//fk
 
-      }
+  TH2F* hQTC = new TH2F("hQTC","QTC ; #PMT; QTC [#channnels]", 24, 0, 24,Int_t( (high[212]-low[212])/4),low[212],high[212]);
+  hQTC->SetOption("COLZ");
+  Add2RawsList( hQTC,212, expert, !image, !saveCorr);//fk
+  
+  TH1F* hNumPMTA= new TH1F("hNumPMTA","number of PMT hitted per event A side",13, 0 ,13);
+  Add2RawsList(hNumPMTA ,213, expert, image, !saveCorr);
+  
+  TH1F* hNumPMTC= new TH1F("hNumPMTC","number of PMT hitted per event C side",13, 0 ,13);
+  Add2RawsList(hNumPMTC ,214, expert, image, !saveCorr);
+  
+  TH1F* hHitsOrA= new TH1F("hHitsOrA","T0_OR A hit multiplicity",20, 0 ,20);
+  Add2RawsList( hHitsOrA,215, expert, !image, !saveCorr);
+  
+  TH1F* hHitsOrC= new TH1F("hHitsOrC","T0_OR C hit multiplicity",20, 0 ,20);
+  Add2RawsList(hHitsOrC ,216, expert, !image, !saveCorr);
+  
+  
+  TH1F* hOrCminOrA= new TH1F("hOrCminOrA","T0_OR C - T0_OR A [cm]",10000,-5000,5000);
+  Add2RawsList( hOrCminOrA,219, expert, !image, !saveCorr); //FK
 
-  //from PMT1 (equalizing)
-  for (Int_t i=0; i<24; i++)
-    {
-      // for events with trigger CALIBRATION_EVENT
-      timeCalname ="hRawCFDcalpmt";
-      timename ="hRawCFDpmt";
-      timeCalname += i+1;
-      ledCalname += i+1;
-      timename += i+1;
-      ledname += i+1;
-      fhRawCFDcalpmt[i] = new TH1F(timeCalname.Data(),  Form("%s;Time;Counts", timeCalname.Data()),2000,-1000,1000);
-       Add2RawsList( fhRawCFDcalpmt[i],321+i , expert, !image, !saveCorr);
+  TH1F* hOrCminOrATvdcOn= new TH1F("hOrCminOrATvdcOn","T0_OR C - T0_OR A TVDC on [cm]",10000,-5000,5000);
+  Add2RawsList( hOrCminOrATvdcOn,217, expert, !image, !saveCorr);//FK
+  
 
-      fhRawCFDpmt[i] = new TH1F(timename.Data(),  Form("%s;Time;Counts", timename.Data()),2000,-1000,1000);
-      Add2RawsList( fhRawCFDpmt[i],220+i, expert, !image, !saveCorr);
-     }
+  TH1F* hOrCminOrATvdcOff= new TH1F("hOrCminOrATvdcOff","T0_OR C - T0_OR A TVDC off [cm]",10000,-5000,5000);
+  Add2RawsList( hOrCminOrATvdcOff,218, expert, !image, !saveCorr);//FK
+
+   //satellite  & beam background
+  TH2F* hBeam = new TH2F("hBeam", "Mean vs Vertex from 1st hit", 120, -30, 30, 120, -30, 30);
+  hBeam->SetOption("COLZ");
+  hBeam->GetXaxis()->SetTitle("(T0C-T0A)/2, ns from 1st"); //vtx
+  hBeam->GetYaxis()->SetTitle("(T0C+T0A)/2, ns"); //time
+  Add2RawsList( hBeam,220, !expert, image, !saveCorr);
+
+  TH2F* hBeamTVDCon = new TH2F("hBeamTVDCon", "Mean vs Vertex TVDC on from 1st hit",50, -5, 5, 50, -5, 5);//FK
+  hBeamTVDCon->SetOption("COLZ");
+  hBeamTVDCon->GetXaxis()->SetTitle("(T0C-T0A)/2, ns from 1st hit");
+  hBeamTVDCon->GetYaxis()->SetTitle("(T0C+T0A)/2, ns");
+  Add2RawsList( hBeamTVDCon,221, expert, image, !saveCorr);
+
+  TH2F* hBeamTVDCoff = new TH2F("hBeamTVDCoff", "Mean vs Vertex TVDC off from 1st hit", 120, -30, 30, 120, -30, 30);
+  hBeamTVDCoff->GetXaxis()->SetTitle("(T0C-T0A)/2, ns from 1st hit");
+  hBeamTVDCoff->GetYaxis()->SetTitle("(T0C+T0A)/2, ns");
+  hBeamTVDCoff->SetOption("COLZ");
+  Add2RawsList( hBeamTVDCoff,222, expert, image, !saveCorr);
+
+  //vertex 1st
+  TH1F* hVertex1stTVDCon = new TH1F("hVertex1stTVDCon", "(T0A-T0C)/2, ps, from 1st hit TVDC on", 200, -2000, 2000); //FK
+  Add2RawsList(hVertex1stTVDCon ,223, !expert, image, !saveCorr);
+  TH1F* hVertex1stTVDCoff = new TH1F("hVertex1stTVDCoff", "(T0A-T0C)/2, ps, from 1st hit TVDC off", 500, -2000, 2000);//FK
+  Add2RawsList( hVertex1stTVDCoff,225, !expert, image, !saveCorr);
+  TH1F* hMean1stTVDCon  = new TH1F("hMean1stTVDCon", "(T0A+T0C)/2, ps, from 1st hit TVDC on", 200, -2000, 2000);//FK
+  Add2RawsList( hMean1stTVDCon,  226, !expert, image, !saveCorr);
+  TH1F* hMean1stTVDCoff = new TH1F("hMean1stTVDCoff", "(T0A+T0C)/2, ps, from 1st hit TVDC off", 200, -2000, 2000);//FK
+  Add2RawsList( hMean1stTVDCoff, 227, !expert, image, !saveCorr);
 
-  TH1F* fhRawTriggerCal = new TH1F("hRawTriggerCal"," laser triggers",6,0,6);
-  Add2RawsList(fhRawTriggerCal ,420 , !expert, image, !saveCorr);
-  TH1F* fhRawMeanCal = new TH1F("hRawMeanCal","online mean signal, calibration event",high[198]-low[198],low[198],high[198]);
-  Add2RawsList( fhRawMeanCal,198, expert, !image, !saveCorr);
+   
+  //FK histograms start from 230
+  TH1F* hRawVertexMinMean = new TH1F("hRawVertexMinMean","online 0TVX vertex signal minus mean; counts",200,-1000,1000);
+  Add2RawsList(hRawVertexMinMean,230, expert, image, !saveCorr);//FK
+
+  TH1F* hCFDSubtrMean = new TH1F("hCFDSubtrMean","CFD minus mean; #PMT; CFD - mean {#channnels}", 24, 0, 24);
+  hCFDSubtrMean->SetMarkerStyle(20);
+  hCFDSubtrMean->SetOption("p");
+  Add2RawsList( hCFDSubtrMean,231, !expert, image, !saveCorr);//fk filled in Checker
+    
+  TH1F* hLEDSubtrMean = new TH1F("hLEDSubtrMean","LED minus mean; #PMT; LED - mean [#channnels]", 24, 0, 24);
+  hLEDSubtrMean->SetMarkerStyle(20);
+  hLEDSubtrMean->SetOption("p");
+  Add2RawsList( hLEDSubtrMean,232, expert, image, !saveCorr);//fk filled in Checker
+
+  TH1F* hQTCSubtrMean = new TH1F("hQTCSubtrMean","QTC minus mean; #PMT; QTC - mean [#channnels]", 24, 0, 24);
+  hQTCSubtrMean->SetMarkerStyle(20);
+  hQTCSubtrMean->SetOption("p");
+  Add2RawsList( hQTCSubtrMean,233, expert, image, !saveCorr);//fk filled in Checker
  
-  TH1F* fhRawVertexCal = new TH1F("hRawVertexCal","online vertex signal, calibration event ", high[199]-low[199],low[199],high[199] );
-   Add2RawsList( fhRawVertexCal,199, expert, !image, !saveCorr);
+  TH2F* hDiffOrCVersusDiffOrATvdcOn= new TH2F("hDiffOrCVersusDiffOrATvdcOn","ORC-meanORC versus ORA-meanORA (TVDC on)",50,-200,200,50,-200,200);
+  hDiffOrCVersusDiffOrATvdcOn->SetOption("COLZ");
+  hDiffOrCVersusDiffOrATvdcOn->GetXaxis()->SetTitle("ORA - mean ORA [channel]");
+  hDiffOrCVersusDiffOrATvdcOn->GetYaxis()->SetTitle("ORC - mean ORC [channel]");
+  Add2RawsList(hDiffOrCVersusDiffOrATvdcOn, 234, expert, image, !saveCorr);//FK
+  
+  TH2F* hDiffOrCVersusDiffOrATvdcOff= new TH2F("hDiffOrCVersusDiffOrATvdcOff","ORC-meanORC vetsus ORA-meanORA (TVDC off)",50,-200,200,50,-200,200);
+  hDiffOrCVersusDiffOrATvdcOff->SetOption("COLZ");
+  hDiffOrCVersusDiffOrATvdcOff->GetXaxis()->SetTitle("ORA - mean ORA [channel]");
+  hDiffOrCVersusDiffOrATvdcOff->GetYaxis()->SetTitle("ORC - mean ORC [channel]");
+  Add2RawsList(hDiffOrCVersusDiffOrATvdcOff, 235, expert, image, !saveCorr);//FK
  
+  TH2F* hBCID = new TH2F("hBCID", "header BCID vs TRM BC ID ", 500, 0, 5000, 500, 0, 5000);
+  hBCID->SetOption("COLZ");
+  hBCID->GetXaxis()->SetTitle("TRM BC ID");
+  hBCID->GetYaxis()->SetTitle("event header BC ID");
+  Add2RawsList(hBCID ,236, !expert, image, !saveCorr);
+
+  //CFD and LED efficiency in range ~2000- ~3000 
+  TH1F* hCFDeffSubRange = new TH1F("hCFDeffSubRange"," CFD eff in subrange; #PMT; #CFD counts/nEvents",24, 0 ,24);  
+  Add2RawsList( hCFDeffSubRange, 237, expert, !image, !saveCorr);//FK  
+
  
-  TH1F* fhRawORAcal = new TH1F("hRawORAcal","laser OR A; counts", high[200]-low[200],low[200],high[200]);
-   Add2RawsList( fhRawORAcal,200, expert, !image, !saveCorr );
+  TH1F* hEffLEDSubRange = new TH1F("hEffLEDSubRange","LED eff in subrange; #PMT; #LED counts/nEvent",24, 0 ,24);
+  Add2RawsList( hEffLEDSubRange,238, expert, !image, !saveCorr);//FK
+  // ratio CDF eff /LEF eff in subragne 
+  TH1F* hRatioCFDLEDeff = new TH1F("hRatioCFDLEDeff","Ratio CFD/LED eff in subrange; #PMT; ratio CDF/LED eff",24, 0 ,24);  
+  hRatioCFDLEDeff->SetMinimum(0);
+  hRatioCFDLEDeff->SetMaximum(2);
+  Add2RawsList( hRatioCFDLEDeff, 239, !expert, image, !saveCorr);//FK   
  
+  TH1F* hEventCounter = new TH1F("hEventCounter","Event counter for eff histos; X; number of events",1, 0 ,1);  
+  Add2RawsList( hEventCounter, 240, expert, !image, !saveCorr);//FK   
+
+  //counters 
+  TH1F* hRawTriggerCounter = new TH1F("hRawTriggerCounter"," triggers;Trigger ;Counts",6,0,6);
+  for (Int_t itr=0; itr<6; itr++) hRawTriggerCounter->Fill(triggers[itr], 0);
+  Add2RawsList(hRawTriggerCounter ,241, expert, !image, !saveCorr);
  
-  TH1F* fhRawORCcal = new TH1F("hRawORCcal","laserOR C;counts ", high[201]-low[201],low[201],high[201]);
-   Add2RawsList( fhRawORCcal,201, expert, !image, !saveCorr);
+  TH1F* hCFDCounter= new TH1F("hCFDCounter"," CFD counter #PMT; #CFD counts",24, 0 ,24);  
+  Add2RawsList( hCFDCounter, 242, expert, !image, !saveCorr);//FK   
+  TH1F* hLEDCounter = new TH1F("hLEDCounter","LED counter; #PMT; #LED counts",24, 0 ,24);
+  Add2RawsList( hLEDCounter, 243, expert, !image, !saveCorr);//FK
  
-
-  //multiplicity trigger
-  TH1F* fhMultcal = new TH1F("hMultcal","full mulltiplicity;Multiplicity;Entries", high[202]-low[202],low[202],high[202]);
-  Add2RawsList( fhMultcal,202, expert, !image, !saveCorr );
-   TH1F* fhMultScal = new TH1F("hMultSemical","full multiplicity with semi-central trigger;Multiplicity;Entries",
-                            high[203]-low[203],low[203],high[203] );
-  Add2RawsList( fhMultScal,203, expert, !image, !saveCorr);
-  TH1F* fhMultCcal = new TH1F("hMultCentrcal","full multiplicity with central trigger;Multiplicity;Entries", 
-                            high[204]-low[204],low[204],high[204]);
-  Add2RawsList( fhMultCcal,204, expert, !image, !saveCorr);
+  TH1F* hCFDeffSubRangeCounter = new TH1F("hCFDeffSubRangeCounter"," CFD eff in subrange counter; #PMT; #CFD counts",24, 0 ,24);  
+  Add2RawsList( hCFDeffSubRangeCounter, 244, expert, !image, !saveCorr);//FK  
+  TH1F* hEffLEDSubRangeCounter = new TH1F("hEffLEDSubRangeCounter","LED eff in subrange counter; #PMT; #LED counts",24, 0 ,24);
+  Add2RawsList( hEffLEDSubRangeCounter,245, expert, !image, !saveCorr);//FK
  
-  TH1F* fhMult = new TH1F("hMult","full mulltiplicity;Multiplicity;Entries", high[216]-low[216],low[216],high[216]);
-  Add2RawsList( fhMult,216, expert, !image, !saveCorr );
-   TH1F* fhMultS = new TH1F("hMultSemi","full multiplicity with semi-central trigger;Multiplicity;Entries",
-                            high[217]-low[217],low[217],high[217] );
-  Add2RawsList( fhMultS,217, expert, !image, !saveCorr);
-  TH1F* fhMultC = new TH1F("hMultCentr","full multiplicity with central trigger;Multiplicity;Entries", 
-                            high[218]-low[218],low[218],high[218]);
-  Add2RawsList( fhMultC,218, expert, !image, !saveCorr);
-
-  TH1F* fhEffCFD = new TH1F("hEffCFD","#PMT; #CFD counts/nEvents",24, 0 ,24); 
-  Add2RawsList( fhEffCFD,205, !expert, image, !saveCorr);
+  TH1F* hQTCCounter = new TH1F("hQTCCounter","QTC counter; #PMT; QTC counts;",24, 0 ,24);
+  Add2RawsList( hQTCCounter,246, expert, !image, !saveCorr);
  
-  TH1F* fhEffLED = new TH1F("hEffLED","#PMT; #LED counts/nEvent",24, 0 ,24);
-  Add2RawsList( fhEffLED,206, !expert, image, !saveCorr);
-
-  TH1F* fhEffQTC = new TH1F("hEffQTC","#PMT; QTC efficiency%s;",24, 0 ,24);
-  Add2RawsList( fhEffQTC,207, !expert, image, !saveCorr);
-
-  
-  TH2F* fhCFDcal = new TH2F("hCFDcal","CFD laser; #PMT; CFD {#channnels}",25, 0 ,25,high[208]-low[208],low[208],high[208]);
-  fhCFDcal->SetOption("COLZ");
-  Add2RawsList( fhCFDcal,208, !expert, image, !saveCorr);
-
-
-  TH2F* fhLEDcal = new TH2F("hLEDcal","LED laser; #PMT; LED [#channnels]",25, 0 ,25, high[209]-low[209],low[209],high[209]);
-  fhLEDcal->SetOption("COLZ");
-  Add2RawsList( fhLEDcal,209, !expert, image, !saveCorr);
-
-
-  TH1F* fhNumPMTA= new TH1F("hNumPMTA","number of PMT hitted per event",12, 0 ,12);
-  Add2RawsList(fhNumPMTA ,211, expert, !image, !saveCorr);
-
-  TH1F* fhNumPMTC= new TH1F("hNumPMTC","number of PMT hitted per event",12, 0 ,12);
-  Add2RawsList(fhNumPMTC ,212, expert, !image, !saveCorr);
-
-  TH1F* fhHitsOrA= new TH1F("fhHitsOrA","T0_OR A hit multiplicitie",10, 0 ,10);
-  Add2RawsList( fhHitsOrA,213, expert, !image, !saveCorr);
-
-  TH1F* fhHitsOrC= new TH1F("fhHitsOrC","T0_OR C hit multiplicitie",10, 0 ,10);
-  Add2RawsList(fhHitsOrC ,214, expert, !image, !saveCorr);
-
-  TH1F* fhOrCminOrA= new TH1F("fhOrCminOrA","T0_OR C - T0_OR A", high[215]-low[215],low[215],high[215]);
-  Add2RawsList( fhOrCminOrA,215, expert, !image, !saveCorr);
-
- const Char_t *triggers[6] = {"mean", "vertex","ORA","ORC","central","semi-central"};
-  for (Int_t itr=0; itr<6; itr++) {
-    GetRawsData(420)->Fill(triggers[itr], fNumTriggersCal[itr]);
-    GetRawsData(420)->SetBinContent(itr+1, fNumTriggersCal[itr]);
-    GetRawsData(97)->Fill(triggers[itr], fNumTriggers[itr]);
-    GetRawsData(97)->SetBinContent(itr+1, fNumTriggers[itr]);
-  }  
+  ClonePerTrigClass(AliQAv1::kRAWS); // this should be the last line
 }
-
+  
 //____________________________________________________________________________ 
 void AliT0QADataMakerRec::InitDigits()
 {
@@ -375,7 +547,10 @@ void AliT0QADataMakerRec::InitDigits()
   Add2DigitsList( fhDigLEDamp,1, !expert, !image);
   TH2F * fhDigQTC = new TH2F("fhDigQTC", " QTC digits; #PMT; QTC amplitude",25,-0.5,24.5,100,100,10000);
   fhDigQTC->SetOption("COLZ");
-  Add2DigitsList( fhDigQTC,2, !expert, !image);}
+  Add2DigitsList( fhDigQTC,2, !expert, !image);
+  //
+  ClonePerTrigClass(AliQAv1::kDIGITS); // this should be the last line
+}
 
 //____________________________________________________________________________ 
 
@@ -385,19 +560,20 @@ void AliT0QADataMakerRec::InitRecPoints()
   const Bool_t expert   = kTRUE ; 
   const Bool_t image    = kTRUE ; 
 
-  TH2F* fhRecCFD = new TH2F("hRecCFD"," CFD time;Time [ns];Counts",24, 0 ,24, 
+  TH2F* fhRecCFD = new TH2F("hRecCFD"," CFD time;#PMT; CFD Time [ns];",24, 0 ,24, 
                              100,-50,50);
   fhRecCFD->SetOption("COLZ");
   Add2RecPointsList ( fhRecCFD,0, !expert, image);
 
-  TH2F* fhRecAmpDiff = new TH2F("hRecAmpDiff"," LED-CFD  min QTC amplitude;Amplitude [ADC counts];Counts",
+  TH2F* fhRecAmpDiff = new TH2F("hRecAmpDiff"," LED-CFD  min QTC amplitude;#PMT; difference [MIPs];",
                                24, 0 ,24, 200,-10,10);
   fhRecAmpDiff->SetOption("COLZ");
   Add2RecPointsList (fhRecAmpDiff, 1, !expert, image);
   
   TH1F *fhMean = new TH1F("hMean","online - rec mean;online - rec mean[#channels];",2000, -1000, 1000);
   Add2RecPointsList ( fhMean,2, !expert, image);
-
+  //
+  ClonePerTrigClass(AliQAv1::kRECPOINTS); // this should be the last line
 }
 
 //____________________________________________________________________________
@@ -407,204 +583,305 @@ void AliT0QADataMakerRec::InitESDs()
   const Bool_t expert   = kTRUE ; 
   const Bool_t image    = kTRUE ; 
   
-  TH1F *fhESDMean = new TH1F("hESDmean"," ESD mean; mean time[%channels]",1000,0,1000);
-  Add2ESDsList(fhESDMean, 0, !expert, image) ;
+  TH1F *fhESDMean = new TH1F("hESDmean"," ESD mean; mean time[%channels]",1000, -5, 5);
+  Add2ESDsList(fhESDMean, 0, expert, !image) ;
   TH1F * fhESDVertex = new TH1F("hESDvertex","ESDvertex; vertex[cm];",82,-30,30);
-  Add2ESDsList(fhESDVertex, 1, !expert, image) ;
+  Add2ESDsList(fhESDVertex, 1, expert, !image) ;
   
-
+  TH1F * fhESDResolution = new TH1F("hESDResolution","(T0A-T0C)/2 corrected by SPD vertex; ns",800,-2,2);
+  Add2ESDsList(fhESDResolution, 2, !expert, image) ;
+  //
+  ClonePerTrigClass(AliQAv1::kESDS); // this should be the last line
 }
 
 //____________________________________________________________________________
 void AliT0QADataMakerRec::MakeRaws( AliRawReader* rawReader)
 {
-
+  //indices in lookup table lookUpTable_tanay.txt 
+  enum { kTZeroRefPoint=0, kTZeroFirstCfdC=1, kTZeroFirstLedC=13, kTZeroFirstQT0C=25,kTZeroFirstQT1C=26,
+         kTZeroVertex=50, kTZeroOrA=51, kTZeroOrC=52, kT0multAQ0=53, kT0multAQ1=54, kTZeroMultCent=55, kTZeroMultSemi=56,
+         kTZeroFirstCfdA=57, kTZeroFirstLedA=69, kTZeroFirstQT0A=81,kTZeroFirstQT1A=82,
+         kT0multCQ0=105, kT0multCQ1=106 
+  }; 
+
+  Int_t  time[24] ;
+  for(Int_t i=0; i<24; i++) time[i] = 0;         
   rawReader->Reset() ; 
   //fills QA histos for RAW
-  Int_t shift=0;
+  //Int_t shift=0;
   // Int_t refPointParam = GetRecoParam()->GetRefPoint();
   Int_t refpoint = 0;
   Int_t refPointParam = 0;
-
+  
   AliT0RawReader *start = new AliT0RawReader(rawReader);
   
-  if (! start->Next())
+  if (! start->Next()) {
     AliDebug(AliQAv1::GetQADebugLevel(),Form(" no raw data found!!"));
-  else
-    {  
-      
-      UInt_t type =rawReader->GetType();
-      if (type == 8){ shift=101; fnEventCal++;} 
-      if (type == 7){ shift=0;   fnEventPhys++;}
-      Int_t allData[110][5];
-      for (Int_t i0=0; i0<105; i0++)
-       {
-         for (Int_t j0=0; j0<5; j0++) allData[i0][j0]=0;
-       }
-      for (Int_t i=0; i<105; i++) 
-       for (Int_t iHit=0; iHit<5; iHit++)
-         allData[i][iHit]= start->GetData(i,iHit);
+    delete start;
+    return;
+  }
+  UInt_t type =rawReader->GetType();
+  if (GetEventSpecie()==AliRecoParam::kCalib && type!=8) {
+     delete start;
+    return;
+  }
+  //
+  // RS: Don't use custom counters, they create problems with trigger cloning
+  //     Use instead framework counters, incremented in the end of this routine
+  // RS: There is some inconsistency here: the separation of physics and calib. events/histos is done by
+  // fEventSpecie. Why do we book separate histos on different slots for calib and physics ? 
+  // I am changing this in such way that we don't need local counters like fNumTriggers (the corresponding
+  // histos now incremented in the MakeRaws, and for the normalization I will use the framework's counters
+  // AliQADataMaker::GetEvCountCycle(...), AliQADataMaker::GetEvCountTotal(...)
+  //
+  // I think the histos xx+250 should be suppressed (the xx calib histos of specie==calibration will be 
+  // used automatically)
       
-      if (allData[0][0] > 0 ) GetRawsData(0) -> Fill( allData[0][0]);
+ //
+  //BC ID
+  //  if (type == 7){
+  UInt_t bcid = rawReader->GetBCID();
+  UInt_t       trmbcid = start->GetTRMBunchID();
+  
+  FillRawsData(236,trmbcid, bcid);
+  //FillRawsData(236,100, bcid); fake error for testing
  
-      refpoint = allData[refPointParam][0];
-      if (refPointParam <  0 ) refpoint=0; 
-      if (refPointParam == 0 ) refpoint = allData[0][0] - 5000;
-
-      Int_t numPmtC=0;    
-      for (Int_t ik = 0; ik<12; ik++)
-       {
-       //      for (Int_t iHt=0; iHt<1; iHt++){
-
-       Int_t nhitsPMT=0;
-       if(allData[ik+1][0]>0 && type == 7  ) numPmtC++;
-       for (Int_t iHt=0; iHt<5; iHt++){
-         //cfd
-         if(allData[ik+1][iHt]>0) {
-           GetRawsData(shift+ik+1) -> Fill(allData[ik+1][iHt]-refpoint);
-           if(allData[1][0]>0) 
-           GetRawsData(shift+ik+220) -> Fill(allData[ik+1][iHt]-allData[1][0]);
-           //      cout<<"C  cfd "<<ik<<" "<<iHt<<" "<<allData[ik+1][iHt]<<" -RF "<<refpoint<<"  "<<allData[ik+1][iHt]-refpoint<<endl;
-           if(type == 8  ) {
-             feffC[ik]++;
-             GetRawsData(208)->Fill(ik+1, allData[ik+1][iHt]-refpoint);
-           } 
-           if(type == 7  )  nhitsPMT++;
-           
-         }
-         //led
-         if(allData[ik+13][iHt] > 0) { 
-           GetRawsData(shift+ik+24+1)->  Fill(allData[ik+13][iHt]-refpoint);
-           //      cout<<"C  led "<<ik<<" "<<iHt<<" "<<allData[ik+1][iHt]<<" -RF "<<refpoint<<"  "<<allData[ik+13][iHt]-refpoint<<endl;
-           if(type == 8  ) {
-             feffA[ik]++;
-             GetRawsData(209)->Fill(ik+1, allData[ik+13][iHt]-refpoint);
-           }
-         }
-         //led -cfd
-
-         if(allData[ik+13][iHt] > 0 && allData[ik+1][iHt] >0 )
-           GetRawsData(shift+ik+48+1)->
-             Fill(allData[ik+13][iHt]-allData[ik+1][iHt]);
-
-         //qtc
-         if(allData[2*ik+25][iHt] > 0 || allData[2*ik+26][iHt] > 0) {
-           GetRawsData(shift+ik+72+1)->
-             Fill(allData[2*ik+25][iHt]-allData[2*ik+26][iHt]);
-           GetRawsData(shift+ik+270)->Fill(allData[2*ik+26][iHt] - refpoint);
-           GetRawsData(shift+ik+24+270)->Fill(allData[2*ik+25][iHt] - refpoint);
-
-           if(type == 8  ) feffqtc[ik]++;
-         }
-       }
-       if(type == 7  ) GetRawsData(ik+244)->Fill(nhitsPMT);
+ //  }    
+  //    if (type == 7){ shift=1;   fnEventPhys++;}
+  Int_t allData[110][5];
+  for(Int_t i0=0; i0<110; i0++){
+    for(Int_t j0=0; j0<5; j0++){
+      allData[i0][j0]=0;
+    } 
+  }
+
+  for(Int_t i=0; i<=kT0multCQ1; i++){ 
+    for(Int_t iHit=0; iHit<5; iHit++){
+      allData[i][iHit]= start->GetData(i,iHit);
+    }
+  }
+
+  if( allData[kTZeroRefPoint][0] > 0  /*&& (type == 7)*/){
+    FillRawsData(0, allData[kTZeroRefPoint][0]); //Reference point
+  }
+  refpoint = allData[refPointParam][0];
+  if(refPointParam <  0 ) refpoint=0; 
+  if(refPointParam == 0 ) refpoint = allData[kTZeroRefPoint][0] - 5000;
+  
+  Int_t offsetCDF, offsetLED, offsetQT0, offsetQT1;
+  Int_t numPmtC=0;    
+  Int_t numPmtA=0;   
+  for(Int_t ik = 0; ik<24; ik++){
+    Int_t ipmt = ik; //C side
+    if(ik<12) {
+      offsetCDF = kTZeroFirstCfdC;
+      offsetLED = kTZeroFirstLedC;
+      offsetQT0 = kTZeroFirstQT0C;
+      offsetQT1 = kTZeroFirstQT1C;
+      if(allData[ipmt+offsetCDF][0]>0 /*&& type == 7 */ )  numPmtC++;
+    }else{
+      ipmt = ik - 12; //A side 
+      offsetCDF = kTZeroFirstCfdA;
+      offsetLED = kTZeroFirstLedA;
+      offsetQT0 = kTZeroFirstQT0A;
+      offsetQT1 = kTZeroFirstQT1A;
+      if(allData[ipmt + offsetCDF][0]>0 /*&& type == 7 */) numPmtA++;
+    }
+    Int_t nhitsPMT=0; //count hits for this pmt
+
+    for (Int_t iHt=0; iHt<5; iHt++) {
+      //cfd
+      if(allData[ipmt+offsetCDF][iHt]>0){
+       FillRawsData(ik+1, allData[ipmt+offsetCDF][iHt]);  //CFD for each PMT
+       FillRawsData(210, ik, allData[ipmt+offsetCDF][iHt]); //CFD vs PMT
+       FillRawsData(242,ik,1.); // CFD counter for efficiency  
+       if( fCFDEffSubRangeLowParam<allData[ipmt+offsetCDF][iHt] && allData[ipmt+offsetCDF][iHt]<fCFDEffSubRangeHighParam){
+          FillRawsData(244,ik,1.); //count CDF entries in given subrange  for   CDF/LED eff ratio
+        }
+       AliDebug(50,Form("%i CFD %i  data %s",ik, ipmt+offsetCDF,  GetRawsData(ik+1)->GetName()));
+       nhitsPMT++;
       }
-      if(type == 7  ) GetRawsData(212)->Fill(numPmtC);
-      Int_t numPmtA=0;    
-       for (Int_t ik = 12; ik<24; ik++) {
-       //      for (Int_t iHt=0; iHt<1; iHt++) {
-       if(allData[ik+45][0]>0 && type == 7 ) numPmtA++;
-       Int_t nhitsPMT=0;
-       for (Int_t iHt=0; iHt<5; iHt++) {
-         if(allData[ik+45][iHt]>0) {
-           //cfd
-           GetRawsData(shift+ik+1)->
-             Fill(allData[ik+45][iHt]-refpoint);
-           if(allData[57][0]>0) 
-           GetRawsData(shift+ik+220) -> Fill(allData[ik+45][iHt]-allData[57][0]);
-
-           //      cout<<"A  cfd "<<ik<<" "<<iHt<<" "<<allData[ik+1][iHt]<<" -RF "<<refpoint<<"  "<<allData[ik+1][iHt]-refpoint<<endl;
-           if(type == 8  ) {
-             feffC[ik]++;
-             GetRawsData(208)->Fill(ik+1, allData[ik+45][iHt]-refpoint);
-           } 
-           if(type == 7  )   nhitsPMT++;
-           
-
-         }
-         //led
-         if(allData[ik+57][iHt] > 0 ) {
-           GetRawsData(shift+ik+24+1)->Fill(allData[ik+57][iHt]-refpoint);
-           //   cout<<"C  led "<<ik<<" "<<iHt<<" "<<allData[ik+1][iHt]<<" -RF "<<refpoint<<"  "<<allData[ik+13][iHt]-refpoint<<endl;
-           if(type == 8  ) {
-             feffA[ik]++;
-             GetRawsData(209)->Fill(ik+1, allData[ik+57][iHt]-refpoint);
-           }
-         }
-           //qtc         
-         if(allData[2*ik+57][iHt]>0 || allData[2*ik+58][iHt]>0)
-           {
-             GetRawsData(shift+ik+72+1)-> Fill(allData[2*ik+57][iHt]-allData[2*ik+58][iHt]);
-             GetRawsData(shift+ik+270)->Fill(allData[2*ik+58][iHt]-refpoint);
-             GetRawsData(shift+ik+24+270)->Fill(allData[2*ik+57][iHt]-refpoint);
-             if(type == 8  )  feffqtc[ik]++;
-           } 
-         //led-cfd
-         if(allData[ik+57][iHt] > 0 &&allData[ik+45][iHt]>0)
-           GetRawsData(shift+ik+48+1)->
-             Fill(allData[ik+57][iHt]-allData[ik+45][iHt]);
-       }
-       if(type == 7  ) GetRawsData(ik+244)->Fill(nhitsPMT);
+      //led
+      if(allData[ipmt+offsetLED][iHt] > 0){ 
+       FillRawsData(ik+25,allData[ipmt+offsetLED][iHt]);
+       FillRawsData(211,ik, allData[ipmt+offsetLED][iHt]);
+       FillRawsData(243,ik,1.); //LED counter for LED efficiency 
+        if(fLEDEffSubRangeLowParam < allData[ipmt+offsetLED][iHt] && allData[ipmt+offsetLED][iHt]<fLEDEffSubRangeHighParam){
+         FillRawsData(245,ik,1.); //count LED entries in given subrange for   CDF/LED eff ratio
+        } 
+       AliDebug(50,Form("%i LED %i  data %s",ik, ipmt+offsetLED,  GetRawsData(ik+25)->GetName()));
+      }
+
+      //led -cfd
+      if(allData[ipmt+offsetLED][iHt] > 0 && allData[ipmt+offsetCDF][iHt] > 0 )
+       FillRawsData(ik+49, allData[ipmt+offsetLED][iHt]-allData[ipmt+offsetCDF][iHt]);
+      
+      //qtc
+      if(allData[2*ipmt+offsetQT0][iHt] > 0 &&
+        allData[2*ipmt+offsetQT1][iHt] > 0 ) {
+        
+       FillRawsData(ik+73, allData[2*ipmt+offsetQT0][iHt]-allData[2*ipmt+offsetQT1][iHt]); //QTC = QT0 - QT1 for each channel
+       FillRawsData(212,ik, allData[2*ipmt+offsetQT0][iHt]-allData[2*ipmt+offsetQT1][iHt]); //QTC vs pmt
+
+       FillRawsData(246,ik,1.); // QTC counter for QTC efficiency
 
+       AliDebug(50,Form("%i QTC %i  data %s",ik, 2*ipmt+offsetQT0, GetRawsData(ik+73)->GetName()));
+       
       }
-       if(type == 7  ) GetRawsData(211)->Fill(numPmtA);
-
-      Int_t trChannel[6] = {49,50,51,52,55,56};  
-       
-      if(type == 7)
-       {
-         Int_t nhitsOrA=0;
-         Int_t nhitsOrC=0;
-         for (Int_t iHt=0; iHt<5; iHt++) {
-           for (Int_t itr=0; itr<6; itr++) {
-             if (allData[trChannel[itr]][iHt] >0) {
-               fNumTriggers[itr]++;
-               GetRawsData(98+itr)->Fill(allData[trChannel[itr]][iHt]-refpoint);
-             }
-           }
-
-           if(allData[51][iHt] >0) nhitsOrA++;
-           if(allData[52][iHt] >0) nhitsOrC++;
-           
-           if(allData[53][iHt]>0 && allData[54][iHt]>0) {
-             GetRawsData(216)->Fill(allData[53][iHt]-allData[54][iHt]);
-             if(allData[55][iHt]>0) GetRawsData(216)->Fill(allData[53][iHt]-allData[54][iHt]);
-             if(allData[56][iHt]>0) GetRawsData(218)->Fill(allData[53][iHt]-allData[54][iHt]);
-           }
-           if(allData[51][iHt]>0 && allData[52][iHt]>0)
-             GetRawsData(215)->Fill(allData[52][iHt]-allData[51][iHt]);
-         }
-         GetRawsData(213)->Fill(nhitsOrA);
-         GetRawsData(214)->Fill(nhitsOrC);
-         
-       }
+      if(allData[2*ipmt+offsetQT0][iHt] > 0) { //QT0
+       AliDebug(50,Form("%i QT0 %i  data %s",ik, 2*ipmt+offsetQT0, GetRawsData(ik+97)->GetName()));
+       FillRawsData(ik+97,allData[2*ipmt+offsetQT0][iHt]);
+      }
+      if(allData[2*ipmt+offsetQT1][iHt] > 0) {//QT1
+       AliDebug(50,Form("%i QT1 %i  data %s",ik, 2*ipmt+offsetQT1, GetRawsData(ik+121)->GetName()));
+       FillRawsData(ik+121,allData[2*ipmt+offsetQT1][iHt]);
+      }
+    }
       
-      if(type == 8)
-         {
-           for (Int_t iHt=0; iHt<5; iHt++) {
-             for (Int_t itr=0; itr<6; itr++) {
-               if(allData[trChannel[itr]][iHt]>0)
-                 {
-                   
-                   GetRawsData(198+itr)->
-                     Fill(allData[trChannel[itr]][iHt]-refpoint);
-                   fNumTriggersCal[itr]++;
-                 }
-             }
-             if(allData[53][iHt]>0 && allData[54][iHt]>0) {
-               GetRawsData(202)->Fill(allData[53][iHt]-allData[54][iHt]);
-               if(allData[55][iHt]>0) GetRawsData(202)->Fill(allData[53][iHt]-allData[54][iHt]);
-               if(allData[56][iHt]>0) GetRawsData(204)->Fill(allData[53][iHt]-allData[54][iHt]);
-             }
-           }
-         } 
+    FillRawsData(ik+176, nhitsPMT);
+  }
+  FillRawsData(213, numPmtA);
+  FillRawsData(214, numPmtC);
+     
+  Int_t trChannel[6] = {kTZeroRefPoint, kTZeroVertex, kTZeroOrA, kTZeroOrC, kTZeroMultCent, kTZeroMultSemi};
+  Float_t ch2cm = 24.4*0.029979;     
+  Int_t nhitsOrA=0;
+  Int_t nhitsOrC=0;
+
+  for (Int_t iHt=0; iHt<5; iHt++) {
+    //orA-orC phys tvdc 1 
+    if((allData[kTZeroOrA][iHt]>0 && allData[kTZeroOrC][iHt]>0) && allData[kTZeroVertex][iHt]>0) {
+      AliDebug(10,Form("orA-orC phys tvdc 1  %i  data %s", 217,  GetRawsData(217)->GetName()));
       
-           delete start;
+      FillRawsData(217,(allData[kTZeroOrC][iHt] - allData[kTZeroOrA][iHt])*ch2cm);
+    }
+    //orA-orC phys tvdc 0 
+    if((allData[kTZeroOrA][iHt]>0 && allData[kTZeroOrC][iHt]>0) && allData[kTZeroVertex][iHt]<=0) {
+      AliDebug(10,Form("orA-orC phys tvdc 0  %i  data %s", 218,  GetRawsData(218)->GetName()));
+       
+      FillRawsData(218,(allData[kTZeroOrC][iHt] - allData[kTZeroOrA][iHt])*ch2cm);
+    }
+    if(allData[kTZeroOrA][iHt]>0 && allData[kTZeroOrC][iHt]>0) {
+      AliDebug(50,Form("orA-orC phys tvdc all  %i  data %s", 219,  GetRawsData(219)->GetName()));
+      FillRawsData(219,(allData[kTZeroOrC][iHt] - allData[kTZeroOrA][iHt])*ch2cm);
     }
-}
 
 
+    for (Int_t itr=0; itr<6; itr++) {//T0_MEAN,TO_VERTX,ORA,ORC,T0_mult,T0_mult
+      if (allData[trChannel[itr]][iHt] >0) {
+       //
+       // RS instead of incremented custom counters, fill directly the specie-specific histos
+       //      FillRawsData(169+shift, 0.5+itr, 1.);  // RS: increment counters
+       // FillRawsData(169+shift, itr, 1.);  //hRawTrigger RS: increment counters
+        FillRawsData(241, itr, 1.); // fill trigger counter
+       AliDebug(50,Form(" triggers %i  data %s", 170+itr,  GetRawsData(170+itr)->GetName()));
+       
+       FillRawsData(170+itr,allData[trChannel[itr]][iHt]);
+    
+        if( trChannel[itr] == kTZeroVertex){ //T0_VERTEX minus mean from config files
+         FillRawsData(230, allData[kTZeroVertex][iHt] - fMeanRawVertexParam );
+        }
+      }
+    }
 
+    if(allData[kTZeroOrA][iHt] > 0  &&  allData[kTZeroOrC][iHt] > 0  ){ //FK// ORC-mean   ORA -mean 
+      Float_t  diffORA =  allData[kTZeroOrA][iHt] - fMeanORAParam;
+      Float_t  diffORC =  allData[kTZeroOrC][iHt] - fMeanORCParam;
+      if(allData[kTZeroVertex][iHt]>0){ //TVDC on
+       FillRawsData(234, diffORA, diffORC);     
+         //Estimate mean orA and orC based on these
+       //cout<<"ORA  "<<allData[kTZeroOrA][iHt]<<endl;
+       //cout<<"ORC  "<<allData[kTZeroOrC][iHt]<<endl;
+
+      }else{//TVDC off
+       FillRawsData(235, diffORA, diffORC);
+      }
+    }
+    
+    /*   if(type == 7) */if(allData[kTZeroOrA][iHt] >0){
+                             nhitsOrA++;
+                         } 
+    /* if(type == 7) */if(allData[kTZeroOrC][iHt] >0){
+                             nhitsOrC++;
+                         }
+    //mult trigger signals phys
+    //A side
+    if(allData[kT0multAQ0][iHt]>0 && allData[kT0multAQ1][iHt]>0) {
+      AliDebug(50,Form(" mpdA %i  data %s", 201,  GetRawsData(201)->GetName()));
+      
+      FillRawsData(201,allData[kT0multAQ0][iHt]-allData[kT0multAQ1][iHt]);
+      if(allData[kTZeroMultSemi][iHt]>0) FillRawsData(202,allData[kT0multAQ0][iHt]-allData[kT0multAQ1][iHt]);
+      if(allData[kTZeroMultCent][iHt]>0) FillRawsData(203,allData[kT0multAQ0][iHt]-allData[kT0multAQ1][iHt]);
+    }
+    
+    //C side 
+    if(allData[kT0multCQ0][iHt]>0 && allData[kT0multCQ1][iHt]>0) {
+      AliDebug(50,Form(" mpdC %i  data %s", 204,  GetRawsData(204)->GetName()));
+       
+      FillRawsData(204,allData[kT0multCQ0][iHt]-allData[kT0multCQ1][iHt]);
+      if(allData[kTZeroMultSemi][iHt]>0) FillRawsData(205,allData[kT0multCQ0][iHt]-allData[kT0multCQ1][iHt]);
+      if(allData[kTZeroMultCent][iHt]>0) FillRawsData(206,allData[kT0multCQ0][iHt]-allData[kT0multCQ1][iHt]);
+    }
+  }
+    
+  FillRawsData(215,nhitsOrA);
+  FillRawsData(216,nhitsOrC);
+    
+  //draw satellite
+  for (int itr=-1;itr<GetNEventTrigClasses();itr++) { //RS loop over all active trigger classes, including the global one
+    int itrID = itr==-1 ? -1 : int( GetEventTrigClass(itr)->GetUniqueID());
+
+    TH2 *hBeam             = (TH2*)GetRawsData(220,itrID);
+    TH2 *hBeamTVDCon       = (TH2*)GetRawsData(221,itrID);
+    TH2 *hBeamTVDCoff      = (TH2*)GetRawsData(222,itrID);
+    TH1 *hVertex1stTVDCon  = (TH1*)GetRawsData(223,itrID);
+    TH1 *hVertex1stTVDCoff = (TH1*)GetRawsData(225,itrID);
+    TH1 *hMean1stTVDCon    = (TH1*)GetRawsData(226,itrID);
+    TH1 *hMean1stTVDCoff   = (TH1*)GetRawsData(227,itrID);
+    if(hBeam || hBeamTVDCon || hBeamTVDCoff || hVertex1stTVDCon || hVertex1stTVDCoff || hMean1stTVDCon || hMean1stTVDCoff){
+     
+      Int_t time1stA=9999999;
+      Int_t time1stC=9999999;
+      for(Int_t ipmt=0; ipmt<12; ipmt++){
+       if(allData[ipmt+kTZeroFirstCfdC][0] > 1 ) {
+         time[ipmt] = allData[ipmt+kTZeroFirstCfdC][0] - (Int_t) fMeanCFDFromGoodRunParam[ipmt]; //fk
+         if(time[ipmt] < time1stC)  time1stC=time[ipmt]; //timeC
+       }
+      }
+      for( Int_t ipmt=12; ipmt<24; ipmt++){
+       if(allData[ipmt-12+kTZeroFirstCfdA][0] > 0) {
+         time[ipmt] = allData[ipmt-12+kTZeroFirstCfdA][0] - (Int_t) fMeanCFDFromGoodRunParam[ipmt];//fk
+         if(time[ipmt] < time1stA)  time1stA=time[ipmt]; //timeC
+       }
+      }
+      if(time1stA<99999 && time1stC< 99999) { //From First
+       Float_t t01st  = 24.4 * (Float_t) (( time1stA + time1stC)/2.0);
+       Float_t ver1st = 24.4 * (Float_t) (( time1stC - time1stA)/2.0);
+       if(hBeam) hBeam->Fill(0.001*ver1st, 0.001*(t01st)); //Mean versus vertex
+       if(allData[kTZeroVertex][0] > 0){//TVDC on
+          if(hBeamTVDCon)      hBeamTVDCon->Fill(0.001*ver1st, 0.001*(t01st));//Mean versus  TVDC on from first
+          if(hVertex1stTVDCon) hVertex1stTVDCon->Fill(ver1st);
+          //if(hVertex1stTVDCon) hVertex1stTVDCon->Fill(1500);//for testing AM
+
+          if(hMean1stTVDCon)   hMean1stTVDCon->Fill(t01st);
+         //          if(hMean1stTVDCon)   hMean1stTVDCon->Fill(1800);//testing AM
+        }else{//TVDC off
+          if(hBeamTVDCoff)      hBeamTVDCoff->Fill(0.001*ver1st, 0.001*(t01st));//FK// TVDC off from first
+          if(hVertex1stTVDCoff) hVertex1stTVDCoff->Fill(ver1st);
+          if(hMean1stTVDCoff)   hMean1stTVDCoff->Fill(t01st);
+        }
+      }          
+    } //
+  } // RS loop over all active trigger classes, including the global one
+    //
+    IncEvCountCycleRaws();
+    IncEvCountTotalRaws();
+    //
+    delete start;
+}
+  
 //____________________________________________________________________________
 void AliT0QADataMakerRec::MakeDigits( TTree *digitsTree)
 {
@@ -622,6 +899,10 @@ void AliT0QADataMakerRec::MakeDigits( TTree *digitsTree)
     brDigits->SetAddress(&fDigits);
   }else{
     AliError(Form("EXEC Branch T0 digits not found"));
+    delete digCFD;
+    delete digLED;
+    delete digQT0;
+    delete digQT1;
     return;
   }
   digitsTree->GetEvent(0);
@@ -632,21 +913,24 @@ void AliT0QADataMakerRec::MakeDigits( TTree *digitsTree)
   fDigits->GetQT0(*digQT0);
   fDigits->GetQT1(*digQT1);
   refpoint = fDigits->RefPoint();
-  for (Int_t i=0; i<24; i++)
-    {
+  for (Int_t i=0; i<24; i++) {
     if (digCFD->At(i)>0) {
       Int_t cfd=digCFD->At(i)- refpoint;
-      GetDigitsData(0) ->Fill(i,cfd);
-      GetDigitsData(1) -> Fill(i, (digLED->At(i) - digCFD->At(i)));
-      GetDigitsData(2) -> Fill(i, (digQT1->At(i) - digQT0->At(i)));
+      FillDigitsData(0,i,cfd);
+      FillDigitsData(1,i, (digLED->At(i) - digCFD->At(i)));
+      FillDigitsData(2,i, (digQT1->At(i) - digQT0->At(i)));
     }
-    }  
+  }  
   
   delete digCFD;
   delete digLED;
   delete digQT0;
   delete digQT1;
-  
+  //
+  IncEvCountCycleDigits();
+  IncEvCountTotalDigits(); 
+  delete fDigits;
+  //  
 }
 
 //____________________________________________________________________________
@@ -671,14 +955,18 @@ void AliT0QADataMakerRec::MakeRecPoints(TTree * clustersTree)
   
   for ( Int_t i=0; i<24; i++) {
     if(i<12)
-      GetRecPointsData(0) -> Fill(i, frecpoints -> GetTime(i) - frecpoints -> GetTime(0)); 
+      FillRecPointsData(0, i, frecpoints -> GetTime(i) - frecpoints -> GetTime(0)); 
     if(i>11)
-      GetRecPointsData(0) -> Fill(i,  frecpoints -> GetTime(i) - frecpoints -> GetTime(12)); 
-    GetRecPointsData(1) -> Fill( i, frecpoints -> GetAmp(i) - frecpoints->AmpLED(i));
+      FillRecPointsData(0, i,  frecpoints -> GetTime(i) - frecpoints -> GetTime(12)); 
+    FillRecPointsData(1, i, frecpoints -> GetAmp(i) - frecpoints->AmpLED(i));
   }
   Double_t mmm=frecpoints->GetOnlineMean()- frecpoints->GetMeanTime();
-  GetRecPointsData(2) ->Fill(mmm);
-  
+  FillRecPointsData(2,mmm);
+  //
+  IncEvCountCycleRecPoints();
+  IncEvCountTotalRecPoints();
+  //  
+  delete frecpoints;
 }
 
 //____________________________________________________________________________
@@ -686,7 +974,70 @@ void AliT0QADataMakerRec::MakeESDs(AliESDEvent * esd)
 {
   //fills QA histos for ESD
   
-  GetESDsData(0) -> Fill(esd->GetT0());
-  GetESDsData(1)-> Fill(esd->GetT0zVertex());
-  
+  const Double32_t  *mean;
+  mean = esd->GetT0TOF();
+  Double32_t t0time= 0.001*mean[0];
+  Double32_t orA= 0.001*mean[1];
+  Double32_t orC=0.001* mean[2];
+
+  if (t0time<99)   FillESDsData(0,t0time);
+  if( esd->GetT0zVertex() <99) FillESDsData(1, esd->GetT0zVertex());
+  if( orA<99 && orC<99) FillESDsData(2,(orA-orC)/2.);
+  //
+  IncEvCountCycleESDs();
+  IncEvCountTotalESDs();
+  //
+}
+//____________________________________________________________________________
+//____________________________________________________________________________
+void AliT0QADataMakerRec::ResetDetector(AliQAv1::TASKINDEX_t task)
+{
+
+ //reset the detector histograms for a given task
+  AliQADataMakerRec::ResetDetector(task);
+
+  for(int ih=0; ih<=250; ih++){
+    for(int itr=-1; itr < GetNEventTrigClasses(); itr++){ 
+      int itrID = itr==-1 ? -1 : int( GetEventTrigClass(itr)->GetUniqueID());
+
+      TH1 *htmp = (TH1*) GetRawsData(ih,itrID);
+      if(htmp) htmp->Reset();
+    } 
+  }
+}
+
+
+/*
+void AliT0QADataMakerRec::GetMeanAndSigma(TH1F* hist, Float_t &mean, Float_t &sigma) 
+{
+
+  const double window = 3.;  //fit window 
+  double meanEstimate, sigmaEstimate; 
+  int maxBin;
+  maxBin        =  hist->GetMaximumBin(); //position of maximum
+  meanEstimate  =  hist->GetBinCenter( maxBin); // mean of gaussian sitting in maximum
+  sigmaEstimate = hist->GetRMS();
+  TF1* fit= new TF1("fit","gaus", meanEstimate - window*sigmaEstimate, meanEstimate + window*sigmaEstimate);
+  fit->SetParameters(hist->GetBinContent(maxBin), meanEstimate, sigmaEstimate);
+  hist->Fit("fit","RQ","Q");
+
+  mean  = (Float_t) fit->GetParameter(1);
+  sigma = (Float_t) fit->GetParameter(2);
+
+  delete fit;
+}
+*/
+
+void AliT0QADataMakerRec::SetEfficiency(Int_t idxEffHisto, Int_t idxCounterHisto, Int_t trigger, Float_t totNumOfEvts){
+  //calculate efficiency =  counts/number of events
+  TH1* heff     = GetRawsData(idxEffHisto,trigger);
+  TH1* hcounter = GetRawsData(idxCounterHisto,trigger);
+  if(heff && hcounter && (totNumOfEvts>0.0)){
+    int nb = heff->GetNbinsX();
+    for(int ib=1;ib<=nb;ib++){
+      heff->SetBinContent(ib,((Float_t) hcounter->GetBinContent(ib))/((Float_t) totNumOfEvts));
+    }
+  }
+  return;
 }