]> git.uio.no Git - u/mrichter/AliRoot.git/blobdiff - T0/AliT0QADataMakerRec.cxx
Fixes for bug #49914: Compilation breaks in trunk, and bug #48629: Trunk cannot read...
[u/mrichter/AliRoot.git] / T0 / AliT0QADataMakerRec.cxx
index c47f9dc699c0d7ac925ffdb383dcc3c1e97b6b06..3da4b0896797f05ddfd582777d65345b7f175d71 100644 (file)
 
 //---
 //  Produces the data needed to calculate the quality assurance. 
-//  All data must be mergeable objects.
-//  A. Mastroserio
+//  Alla.Maevskaya@cern.ch
 //---
 
 // --- ROOT system ---
 #include <TClonesArray.h>
 #include <TFile.h> 
 #include <TH1F.h> 
+#include <TH2F.h> 
 #include <TDirectory.h>
 // --- Standard library ---
 
 #include "AliQAChecker.h"
 #include "AliT0RawReader.h"
 
+#include "Riostream.h"
 ClassImp(AliT0QADataMakerRec)
            
 //____________________________________________________________________________ 
   AliT0QADataMakerRec::AliT0QADataMakerRec() : 
-  AliQADataMakerRec(AliQA::GetDetName(AliQA::kT0), "T0 Quality Assurance Data Maker")
+AliQADataMakerRec(AliQAv1::GetDetName(AliQAv1::kT0), 
+                 "T0 Quality Assurance Data Maker"),
+  fnEvent(0)
 
 {
   // ctor
-  /*
-  for(Int_t i=0; i<24; i++) {
-    fhHitsTime[i]=0x0;
-   fhDigCFD[i]=0x0;
-    fhDigLEDamp[i]=0x0;
-    fhRecCFD[i]=0x0;
-    fhRecLEDamp[i]=0x0;
-    fhRecQTC[i]=0x0;
+  for (Int_t i=0; i<6; i++) {
+    fNumTriggers[i]=0;
+    fNumTriggersCal[i]=0;
   }
-  */
- //   fDetectorDir = fOutput->GetDirectory(GetName()) ;  
-//   if (!fDetectorDir) 
-//     fDetectorDir = fOutput->mkdir(GetName()) ;  
+  for (Int_t i=0; i<24; i++)
+    {
+      feffC[i]=0;
+      feffA[i]=0;
+    }
 }
 
 //____________________________________________________________________________ 
 AliT0QADataMakerRec::AliT0QADataMakerRec(const AliT0QADataMakerRec& qadm) :
-  AliQADataMakerRec() 
+  AliQADataMakerRec(),
+  fnEvent(0)
+  
 {
   //copy ctor 
-  /*
-  for(Int_t i=0; i<24; i++) {
-    fhHitsTime[i]=0x0;
-    fhDigCFD[i]=0x0;
-    fhDigLEDamp[i]=0x0;
-    fhRecCFD[i]=0x0;
-    fhRecLEDamp[i]=0x0;
-    fhRecQTC[i]=0x0;
-  }
-  */
-  SetName((const char*)qadm.GetName()) ; 
+ SetName((const char*)qadm.GetName()) ; 
   SetTitle((const char*)qadm.GetTitle()); 
 }
 
@@ -90,17 +81,45 @@ AliT0QADataMakerRec& AliT0QADataMakerRec::operator = (const AliT0QADataMakerRec&
   return *this;
 }
 //____________________________________________________________________________
-void AliT0QADataMakerRec::EndOfDetectorCycle(AliQA::TASKINDEX_t task, TObjArray * list)
+void AliT0QADataMakerRec::EndOfDetectorCycle(AliQAv1::TASKINDEX_t task, TObjArray ** list)
 {
   //Detector specific actions at end of cycle
   // do the QA checking
-  AliQAChecker::Instance()->Run(AliQA::kT0, task, list) ;
+  AliQAChecker::Instance()->Run(AliQAv1::kT0, task, list) ;
+  for (Int_t specie = 0 ; specie < AliRecoParam::kNSpecies ; specie++) {
+    SetEventSpecie(specie) ; 
+    if ( task == AliQAv1::kRAWS ) {
+      const Char_t *triggers[6] = {"mean", "vertex","ORA","ORC","central","semi-central"};
+      for (Int_t itr=0; itr<6; itr++) {
+        GetRawsData(197)->Fill(triggers[itr], fNumTriggersCal[itr]);
+        GetRawsData(197)->SetBinContent(itr+1, fNumTriggersCal[itr]);
+      }  
+      GetRawsData(205)->SetOption("COLZ");
+      GetRawsData(206)->SetOption("COLZ");
+      GetRawsData(207)->SetOption("COLZ");
+      GetRawsData(205)->GetXaxis()->SetTitle("#PMT");
+      GetRawsData(206)->GetXaxis()->SetTitle("#PMT");
+      GetRawsData(205)->GetYaxis()->SetTitle("NeventsReg/Nevents");
+      GetRawsData(206)->GetYaxis()->SetTitle("NeventsReg/Nevents");
+      GetRawsData(207)->GetXaxis()->SetTitle("#PMT");
+      GetRawsData(207)->GetYaxis()->SetTitle("Charge, #channels");
+    }
+    if ( task == AliQAv1::kRECPOINTS) {
+      GetRecPointsData(0)->SetOption("COLZ");
+      GetRecPointsData(1)->SetOption("COLZ");
+      GetRecPointsData(0)->GetXaxis()->SetTitle("#PMT");
+      GetRecPointsData(1)->GetXaxis()->SetTitle("#PMT");
+      GetRecPointsData(0)->GetYaxis()->SetTitle("CFD time");
+      GetRecPointsData(1)->GetYaxis()->SetTitle("Charge, #channels");
+    }
+  }
 }
 
 //____________________________________________________________________________
 void AliT0QADataMakerRec::StartOfDetectorCycle()
 {
   //Detector specific actions at start of cycle
+  fnEvent=0;
 
 }
  
@@ -108,74 +127,110 @@ void AliT0QADataMakerRec::StartOfDetectorCycle()
 void AliT0QADataMakerRec::InitRaws()
 {
   // create Raw histograms in Raw subdir
-  //  printf("   AliT0QADataMakerRec::InitRaws() started\n");
-  TString timename, ampname, qtcname;
-  TString timeCalname, ampCalname, qtcCalname;
+  TString timename, ampname, qtcname, ledname;
+  TString timeCalname, ampCalname, ledCalname, qtcCalname;
 
   TH1F* fhRefPoint = new TH1F("hRefPoint","Ref Point", 10,1252170, 1252180);
   Add2RawsList( fhRefPoint,0);
    
-  TH1F *fhRawCFD[24]; TH1F * fhRawLEDamp[24]; TH1F *fhRawQTC[24];
-  TH1F *fhRawCFDcal[24]; TH1F * fhRawLEDampcal[24]; TH1F *fhRawQTCcal[24];
+  TH1F *fhRawCFD[24]; TH1F * fhRawLEDamp[24];
+  TH1F *fhRawQTC[24]; TH1F * fhRawLED[24];
+  TH1F *fhRawCFDcal[24]; TH1F * fhRawLEDampcal[24]; 
+  TH1F *fhRawQTCcal[24];  TH1F * fhRawLEDcal[24];
   
   for (Int_t i=0; i<24; i++)
     {
       timename ="hRawCFD";
-      ampname = "hRawLED";
+      ledname = "hRawLED";
       qtcname = "hRawQTC";
+      ampname = "hRawLEDminCFD";
       timename += i;
       ampname += i;
       qtcname += i;
-      fhRawCFD[i] = new TH1F(timename.Data(), timename.Data(),500,2100,2800);
+      ledname += i;
+      fhRawCFD[i] = new TH1F(timename.Data(), timename.Data(),500,-250,250);
       Add2RawsList( fhRawCFD[i],i+1);
+      fhRawLED[i] = new TH1F(ledname.Data(), ledname.Data(),2000,-1000,1000);
+      Add2RawsList( fhRawLED[i],i+24+1);
       fhRawLEDamp[i] = new TH1F(ampname.Data(), ampname.Data(),100,300,600);
-      Add2RawsList( fhRawLEDamp[i],i+24+1);
+      Add2RawsList( fhRawLEDamp[i],i+48+1);
       fhRawQTC[i] = new TH1F(qtcname.Data(), qtcname.Data(),1500,1000,7000);
-      Add2RawsList( fhRawQTC[i],i+48+1);
+      Add2RawsList( fhRawQTC[i],i+72+1);
      }
+  //  const Bool_t saveForCorr = kTRUE;
+  const Bool_t saveForCorr = kFALSE;
+  TH1F* fhRawTrigger = new TH1F("hRawTrigger"," phys triggers",5,0,5);
+  Add2RawsList(fhRawTrigger ,97);
   
   TH1F* fhRawMean = new TH1F("hRawMean","online mean signal", 100,2400,2500);
-  Add2RawsList( fhRawMean,73);
+  Add2RawsList( fhRawMean,98);
   TH1F* fhRawVertex = new TH1F("hRawVertex","online vertex signal", 100,0,600);
-  Add2RawsList( fhRawVertex,74);
+  Add2RawsList( fhRawVertex,99);
   TH1F* fhRawORA = new TH1F("hRawORA","online OR A", 100,2500,2800);
-  Add2RawsList( fhRawORA,75);
+  Add2RawsList( fhRawORA,100);
   TH1F* fhRawORC = new TH1F("hRawORC","online OR C", 100,2000,2300);
-  Add2RawsList( fhRawORC,76);
+  Add2RawsList( fhRawORC,101);
+  
   for (Int_t i=0; i<24; i++)
     {
       // for events with trigger CALIBRATION_EVENT
       timeCalname ="hRawCFDcal";
-      ampCalname = "hRawLEDcal";
+      ledCalname = "hRawLEDcal";
+      ampCalname = "hRawLEDminCFDcal";
       qtcCalname = "hRawQTCcal";
       timeCalname += i;
+      ledCalname += i;
       ampCalname += i;
       qtcCalname += i;
-      fhRawCFDcal[i] = new TH1F(timeCalname.Data(), timeCalname.Data(),1000,4000,6000);
-      Add2RawsList( fhRawCFDcal[i],76+i+1);
-      fhRawLEDampcal[i] = new TH1F(ampCalname.Data(), ampCalname.Data(),100,300,600);
-      Add2RawsList( fhRawLEDampcal[i],76+i+24+1);
+      fhRawCFDcal[i] = new TH1F(timeCalname.Data(), timeCalname.Data(),2000,-1000,1000);
+      Add2RawsList( fhRawCFDcal[i],101+i+1);
+      fhRawLEDcal[i] = new TH1F(ledCalname.Data(), ledCalname.Data(),2000,-1000,1000);
+      Add2RawsList( fhRawLEDcal[i],101+i+24+1);
+      fhRawLEDampcal[i] = new TH1F(ampCalname.Data(), ampCalname.Data(),300,300,600);
+      Add2RawsList( fhRawLEDampcal[i],101+i+48+1);
       fhRawQTCcal[i] = new TH1F(qtcCalname.Data(), qtcCalname.Data(),1000,0,7000);
-      Add2RawsList( fhRawQTCcal[i],76+i+48+1);
+      Add2RawsList( fhRawQTCcal[i],101+i+72+1);
     }
+
+  TH1F* fhRawTriggerCal = new TH1F("hRawTriggerCal"," laser triggers",6,0,6);
+  Add2RawsList(fhRawTriggerCal ,197 ,saveForCorr);
+
   TH1F* fhRawMeanCal = new TH1F("hRawMeanCal","online mean signal, calibration event",
-                               1000,7000,8000);
-  Add2RawsList( fhRawMeanCal,149);
+                               10000,0,10000);
+  Add2RawsList( fhRawMeanCal,198);
   TH1F* fhRawVertexCal = new TH1F("hRawVertexCal","online vertex signal, calibration even ",
-                                 1000,7000,8000);
-  Add2RawsList( fhRawVertexCal,150);
-  TH1F* fhRawORAcal = new TH1F("hRawORAcal","online OR A", 200,5000,7000);
-  Add2RawsList( fhRawORAcal,151);
-  TH1F* fhRawORCcal = new TH1F("hRawORCcal","online OR C", 200,5000,7000);
-  Add2RawsList( fhRawORCcal,152);
-  TH1F* fhMultcal = new TH1F("hMultcal","full mulltiplicity", 1000,0,10000);
-  Add2RawsList( fhMultcal,153);
+                                 10000,0,10000);
+  Add2RawsList( fhRawVertexCal,199);
+  TH1F* fhRawORAcal = new TH1F("hRawORAcal","online OR A", 10000,0,10000);
+  Add2RawsList( fhRawORAcal,200 );
+  TH1F* fhRawORCcal = new TH1F("hRawORCcal","online OR C", 10000,0,10000);
+  Add2RawsList( fhRawORCcal,201);
+  TH1F* fhMultcal = new TH1F("hMultcal","full mulltiplicity", 10000,0,10000);
+  Add2RawsList( fhMultcal,202 );
   TH1F* fhMultScal = new TH1F("hMultScal","full multiplicity with semi-central trigger",
-                             1000,0,10000);
-  Add2RawsList( fhMultScal,154);
+                             10000,0,10000);
+  Add2RawsList( fhMultScal,203);
   TH1F* fhMultCcal = new TH1F("hMultCcal","full multiplicity with central trigger", 
                              1000,0,10000);
-  Add2RawsList( fhMultCcal,155);
+  Add2RawsList( fhMultCcal,204);
+
+  //  TH2F* fhEffCFD = new TH2F("hEffCFD"," CFD time",24, 0 ,24, 
+  //                 100,-500,500);
+  TH2F* fhEffCFD = new TH2F("hEffCFD"," CFD time",24, 0 ,24, 50, 0,5); 
+
+  Add2RawsList( fhEffCFD,205, saveForCorr);
+  TH2F* fhEffLED = new TH2F("hEffLED","LED time",24, 0 ,24, 
+                           100, 0, 5); 
+  //100,-500,500);
+
+  Add2RawsList( fhEffLED,206, saveForCorr);
+  TH2F* fhEffQTC = new TH2F("hEffQTC","QTC amplitude",24, 0 ,24, 
+                             100,0,7000);
+  Add2RawsList( fhEffQTC,207, saveForCorr);
+  //yeys guide line
+  //  TH2F* fhLineQTC = new TH2F("hLineQTC","QTC amplitude boeder",24, 0 ,24, 
+  //                         100,0,7000);
+//  Add2RawsList( fhLineQTC,208, saveForCorr);
 }
 
 //____________________________________________________________________________ 
@@ -183,69 +238,49 @@ void AliT0QADataMakerRec::InitRaws()
 void AliT0QADataMakerRec::InitRecPoints()
 {
   // create cluster histograms in RecPoint subdir
-  /* 
- TH2F * fhRecCFD = new TH2F("fhRecCFD", " CFD reconstructed",25,-0.5,24.5,100,12,13);
-  Add2DigitsList( fhRecCFD,0);
-  TH2F *fhRecLEDamp = new TH2F("fhRecLEDamp", " amplitude LED reconstructed",25,-0.5,24.5,100,1000,1000);
-  Add2DigitsList( fhRecLEDamp,1);
- TH2F * fhRecQTC = new TH2F("fhRecQTC", " amplitude QTC reconstructed",25,-0.5,24.5,100,1000,1000);
-  Add2DigitsList( fhRecQTC,2);
- TH1F * fhRecMean = new TH1F("hRecMean"," reconstructed mean signal",100,500,600);
-  Add2DigitsList( fhRecMean,3);
-  */ 
-  
-  //  printf(" !!!!!  AliT0QADataMakerRec::InitRecPoints() started\n");
-  TString timename,ampname, qtcname;
-  TH1F *fhRecCFD[24]; TH1F *fhRecLEDAmp[24];  TH1F * fhRecQTC[24];
-  for (Int_t i=0; i<24; i++)
-    {
-      timename ="hRecCFD";
-      ampname = "hRecLED";
-      qtcname = "hRecQTC";
-      timename += i;
-      ampname += i;
-      qtcname += i;
-      fhRecCFD[i] = new TH1F(timename.Data(), timename.Data(),100,2100,2800);
-     Add2RecPointsList ( fhRecCFD[i],i);
-      fhRecLEDAmp[i] = new TH1F(ampname.Data(), ampname.Data(),100,0, 100);
-    Add2RecPointsList ( fhRecLEDAmp[i],i+24);
-      fhRecQTC[i] = new TH1F(qtcname.Data(), qtcname.Data(),100,0,100);
-    Add2RecPointsList ( fhRecQTC[i],i+48);
-     }
-   
-  TH1F *fhOnlineMean = new TH1F("hOnlineMean","online mean",100,2400,2500);
-  Add2RecPointsList ( fhOnlineMean,72);
-  TH1F * fhRecMean = new TH1F("hRecMean"," reconstructed mean signal",100,2400,2500);
-  Add2RecPointsList( fhRecMean,73);
-  //  printf(" !!!!!!  AliT0QADataMakerRec::InitRecPoints() ended\n");
+
+
+
+  TH2F* fhRecCFD = new TH2F("hRecCFD"," CFD time",24, 0 ,24, 
+                             100,-50,50);
+  Add2RecPointsList ( fhRecCFD,0);
+
+  TH2F* fhRecAmpDiff = new TH2F("hRecAmpDiff"," LED-CFD  min QTC amplitude",
+                               24, 0 ,24, 200,-10,10);
+  Add2RecPointsList (fhRecAmpDiff, 1);
   
-}
+  TH1F *fhMean = new TH1F("hMean","online - rec mean",1000, -5000, 5000);
+  Add2RecPointsList ( fhMean,2);
+ }
 
 //____________________________________________________________________________
 void AliT0QADataMakerRec::InitESDs()
 {
   //create ESDs histograms in ESDs subdir
-  printf(" !!!!!  AliT0QADataMakerESD::InitESD() started\n");
+
   TH1F *fhESDMean = new TH1F("hESDmean"," ESD mean",100,2400,2500);
   Add2ESDsList(fhESDMean, 0) ;
-  TH1F * fhESDVertex = new TH1F("hESDvertex","EAD vertex",100,-50,50);
+  TH1F * fhESDVertex = new TH1F("hESDvertex","ESD vertex",100,-50,50);
   Add2ESDsList(fhESDVertex, 1) ;
   
-  printf(" !!!!!!  AliT0QADataMakerRec::InitESD() ended\n");
 
 }
 
 //____________________________________________________________________________
 void AliT0QADataMakerRec::MakeRaws( AliRawReader* rawReader)
 {
+       rawReader->Reset() ; 
   //fills QA histos for RAW
   Int_t shift=0;
+  Float_t effic ;
+
   AliT0RawReader *start = new AliT0RawReader(rawReader);
   //  start->Next();
   if (! start->Next())
     AliDebug(1,Form(" no raw data found!!"));
   else
     {  
+      fnEvent++;
 
       UInt_t type =rawReader->GetType();
       //     cout<<" !!!!! new event type = "<<type<<endl;
@@ -258,75 +293,116 @@ void AliT0QADataMakerRec::MakeRaws( AliRawReader* rawReader)
        for (Int_t iHit=0; iHit<5; iHit++)
          allData[i][iHit]= start->GetData(i,iHit);
       
-      GetRawsData(0) -> Fill( allData[0][0]);
-      allData[0][0] = allData[0][0] - 5000; 
-      if (type == 8) shift=76;
-      if (type == 10) shift=0;
-           
+      if (allData[0][0]>0)    GetRawsData(0) -> Fill( allData[0][0]);
+      //  allData[0][0] = allData[0][0] - 7000; 
+      if (type == 8) shift=101;
+      if (type == 7) shift=0;
+      
       for (Int_t ik = 0; ik<12; ik++){
        for (Int_t iHt=0; iHt<5; iHt++){
-         if(allData[ik+1][iHt]>0){
-             GetRawsData(shift+ik+1) -> Fill(allData[ik+1][iHt]-allData[0][0]);
-             //              cout<<" type "<<type<<" shift "<<shift<<" koef "<<ik<<" index "<<shift+ik<<
-             //        " time "<<allData[ik+1][iHt]-allData[0][0]<<endl;
-             if(allData[2*ik+25][iHt] > 0 && allData[2*ik+26][iHt] > 0)
-               GetRawsData(shift+ik+48+1)->Fill(allData[2*ik+25][iHt]-allData[2*ik+26][iHt]);
-             if(allData[ik+13][iHt]!=0 )
-               GetRawsData(shift+ik+24+1)->Fill(allData[ik+13][iHt]-allData[ik+1][iHt]);
+         //cfd
+         if(allData[ik+1][iHt]>0)
+           GetRawsData(shift+ik+1) -> 
+             Fill(allData[ik+1][iHt]-allData[1][0]);
+         //led
+         if(allData[ik+13][iHt] > 0 && allData[13][iHt]>0) 
+           GetRawsData(shift+ik+24+1)->
+             Fill(allData[ik+13][iHt]-allData[13][iHt]);
+         //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]);
+         
          
+         if(type == 8 && allData[ik+1][iHt]>0 ) feffC[ik]++; 
+         if(type == 8 && allData[ik+13][iHt]>0 ) feffA[ik]++; 
+         // GetRawsData(206)->Fill(ik,allData[ik+13][iHt]-allData[13][0]);
+         if(type == 8 && (allData[2*ik+25][iHt]>0 && allData[2*ik+26][iHt]>0) ) 
+           GetRawsData(207)->Fill(ik,allData[2*ik+25][iHt]-allData[2*ik+26][iHt]);
        }
-      }
+       effic = Float_t(feffC[ik])/Float_t(fnEvent);
+       GetRawsData(205)->Fill(ik,effic );
+       effic = Float_t(feffA[ik])/Float_t(fnEvent);
+       GetRawsData(206)->Fill(ik,effic );
+       //      printf("CFD  efficiency for PMT %i = %f \n", ik, effic); 
       }
       for (Int_t ik = 12; ik<24; ik++) {
        for (Int_t iHt=0; iHt<5; iHt++) {
-         if(allData[ik+45][iHt]>0) {
-           GetRawsData(shift+ik+1)->Fill(allData[ik+45][iHt]-allData[0][0]);
-           //  cout<<" type "<<type<<" shift "<<shift<<" index "<<shift+ik<<
-           // " time "<<allData[ik+1][iHt]-allData[0][0]<<endl;
-
-           if(allData[2*ik+57][iHt]!=0 && allData[2*ik+58][iHt]!=0)
-             GetRawsData(shift+ik+48+1)->Fill(allData[2*ik+57][iHt]-allData[2*ik+58][iHt]);
-           if(allData[ik+57][iHt] > 0 )
-             GetRawsData(shift+ik+24+1)->Fill(allData[ik+57][iHt]-allData[ik+45][iHt]);
-         }
+         if(allData[ik+45][iHt]>0) 
+           //cfd
+           GetRawsData(shift+ik+1)->
+             Fill(allData[ik+45][iHt]-allData[57][0]);
+           //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]);
+         //led
+         if(allData[ik+57][iHt] > 0 )
+           GetRawsData(shift+ik+24+1)->
+             Fill(allData[ik+57][iHt]-allData[69][iHt]);
+           //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 == 8 && allData[ik+45][iHt]>0 )  feffC[ik]++; 
+
+         if(type == 8 && allData[ik+57][iHt]>0 )  feffA[ik]++; 
+         // GetRawsData(206)->Fill(ik,allData[ik+57][iHt]-allData[69][0]);
+         if(type == 8 && (allData[2*ik+57][iHt]>0 && allData[2*ik+58][iHt]>0) )
+           GetRawsData(207)->Fill(ik,allData[2*ik+57][iHt]-allData[2*ik+58][iHt]);               
        }
+       effic = Float_t(feffC[ik])/Float_t(fnEvent);
+       GetRawsData(205)->Fill(ik,effic );
+       effic = Float_t(feffA[ik])/Float_t(fnEvent);
+       GetRawsData(206)->Fill(ik,effic );
+       //   printf("CFD  efficiency for PMT %i = %f \n", ik, effic);       }
       }
-      
-
-      if(type == 10)
+       
+      Int_t trChannel[6] = {49,50,51,52,55,56};  
+      if(type == 7)
        {
-         GetRawsData(73)->Fill(allData[49][0]-allData[0][0]);
-         GetRawsData(74)->Fill(allData[50][0]-allData[0][0]);
-         GetRawsData(75)->Fill(allData[51][0]-allData[0][0]);
-         GetRawsData(76)->Fill(allData[52][0]-allData[0][0]);
+         for (Int_t iHt=0; iHt<6; iHt++) {
+           for (Int_t itr=0; itr<6; itr++) {
+             if(allData[trChannel[itr]][iHt]>0) fNumTriggers[itr]++;
+           }
+         }
        }
       if(type == 8)
        {
-         GetRawsData(149)->Fill(allData[49][0]-allData[0][0]);
-         GetRawsData(150)->Fill(allData[50][0]-allData[0][0]);
-         GetRawsData(151)->Fill(allData[51][0]-allData[0][0]);
-         GetRawsData(152)->Fill(allData[52][0]-allData[0][0]);
-         /*      cout<<" and "<<allData[49][0]-allData[0][0]<<
-           " vertex "<<allData[50][0]-allData[0][0]<<
-           " ORA "<<allData[51][0]-allData[0][0]<<
-           " ORC "<<allData[52][0]-allData[0][0]<<endl;*/
-
-         GetRawsData(153)->Fill(allData[53][0]-allData[54][0]);
-         if(allData[55][0])  GetRawsData(154)->Fill(allData[53][0]-allData[54][0]);
-         if(allData[55][0])  GetRawsData(155)->Fill(allData[53][0]-allData[54][0]);
-
-       }  
+         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]-allData[1][0]);
+                 
+                 fNumTriggersCal[itr]++;
+               }
+           }
+           if(allData[53][iHt]>0 && allData[54][iHt]>0) 
+             GetRawsData(204)->Fill(allData[53][iHt]-allData[54][iHt]);
+         }
+       } 
+
+      
+      
       delete start;
+      }
     }
   
-}
+
 
 //____________________________________________________________________________
 void AliT0QADataMakerRec::MakeRecPoints(TTree * clustersTree)
 {
   //fills QA histos for clusters
 
-  //   printf(" !!!!!  AliT0QADataMakerRec::MakeRecPoints() started\n");
   AliT0RecPoint* frecpoints= new AliT0RecPoint ();
     if (!frecpoints) {
     AliError("Reconstruct Fill ESD >> no recpoints found");
@@ -341,29 +417,29 @@ void AliT0QADataMakerRec::MakeRecPoints(TTree * clustersTree)
   } 
     
   brRec->GetEntry(0);
-  
-  for ( Int_t i=0; i<24; i++) {
-    
-    GetRecPointsData(i) -> Fill(frecpoints -> GetTime(i)); 
-    GetRecPointsData(i+24) -> Fill(frecpoints -> GetAmp(i));
-    GetRecPointsData(i+48) -> Fill(frecpoints->AmpLED(i));
     
-    //  if(frecpoints -> GetTime(i) > 0) fhRecEff->Fill(i);
+  for ( Int_t i=0; i<24; i++) {
+    if(i<12)
+      GetRecPointsData(0) -> Fill(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));
   }
-     GetRecPointsData(72) ->Fill(frecpoints->GetOnlineMean());
-     GetRecPointsData(73) ->Fill(frecpoints->GetMeanTime());
-     //  printf(" !!!!!  AliT0QADataMakerRec::MakeRecPoints() end\n");
+  Double_t mmm=frecpoints->GetOnlineMean()- frecpoints->GetMeanTime();
+   GetRecPointsData(2) ->Fill(mmm);
+   // printf(" AliT0QADataMakerRec: diff mean  %f \n",mmm ); 
+   // GetRecPointsData(73) ->Fill(frecpoints->GetMeanTime());
   
+
+
 }
 
 //____________________________________________________________________________
 void AliT0QADataMakerRec::MakeESDs(AliESDEvent * esd)
 {
   //fills QA histos for ESD
-  printf(" !!!!!  AliT0QADataMakerRec::MakeESD() started\n");
 
   GetESDsData(0) -> Fill(esd->GetT0());
   GetESDsData(1)-> Fill(esd->GetT0zVertex());
 
 }
-