]> git.uio.no Git - u/mrichter/AliRoot.git/blobdiff - T0/AliT0QADataMakerRec.cxx
Readme for calibration/performance train (Marian)
[u/mrichter/AliRoot.git] / T0 / AliT0QADataMakerRec.cxx
index d2dac6d3f7bfe60aa647eddcdab1e0254927d453..a46525b4d0012220c46064807a1ed3ead9a0f1d8 100644 (file)
@@ -94,10 +94,11 @@ void AliT0QADataMakerRec::EndOfDetectorCycle(AliQAv1::TASKINDEX_t task, TObjArra
   //Detector specific actions at end of cycle
   // do the QA checking
   AliQAChecker::Instance()->Run(AliQAv1::kT0, task, list) ;
+  
   for (Int_t specie = 0 ; specie < AliRecoParam::kNSpecies ; specie++) {
     if (! IsValidEventSpecie(specie, list)) 
       continue ;
-   SetEventSpecie(AliRecoParam::ConvertIndex(specie)) ; 
+    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"};
@@ -107,30 +108,31 @@ void AliT0QADataMakerRec::EndOfDetectorCycle(AliQAv1::TASKINDEX_t task, TObjArra
        if ( fnEventPhys>0) 
          fTrEffPhys[itr] = Float_t (fNumTriggers[itr])/Float_t (fnEventPhys);
 
-        GetRawsData(197)->Fill(triggers[itr], fTrEffCal[itr]);
-        GetRawsData(197)->SetBinContent(itr+1, fTrEffCal[itr]);
+        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;
-         effic = Float_t(feffC[ik])/Float_t(fnEventCal);
+         if ( fnEventCal>0) effic = Float_t(feffC[ik])/Float_t(fnEventCal);
          GetRawsData(205)->SetBinContent(ik+1,effic) ;
          effic=0;
-         effic = Float_t(feffA[ik])/Float_t(fnEventCal);
+         if ( fnEventCal>0) effic = Float_t(feffA[ik])/Float_t(fnEventCal);
          GetRawsData(206)->SetBinContent(ik+1,effic );
          effic=0;
-         effic = Float_t(feffqtc[ik])/Float_t(fnEventCal);
+         if ( fnEventCal>0) effic = Float_t(feffqtc[ik])/Float_t(fnEventCal);
          GetRawsData(207)->SetBinContent(ik+1, effic);
        }
-
+      
+      
     }
+    
   }
-}
 
+}
 //____________________________________________________________________________
 void AliT0QADataMakerRec::StartOfDetectorCycle()
 {
@@ -146,22 +148,33 @@ void AliT0QADataMakerRec::InitRaws()
   const Bool_t expert   = kTRUE ; 
   const Bool_t saveCorr = kTRUE ; 
   const Bool_t image    = kTRUE ; 
+  Float_t low[500];
+  Float_t high[500];
+
   
+  for (Int_t i=0; i<500; i++){
+    low[i]  = GetRecoParam()->GetLow(i);
+    high[i]  = GetRecoParam()->GetHigh(i);
+
+  }
+
   TString timename, ampname, qtcname, ledname;
   TString timeCalname, ampCalname, ledCalname, qtcCalname;
   TString qt1name, qt0name, qt1Calname, qt0Calname;
+  TString nhits;
 
-  TH1F* fhRefPoint = new TH1F("hRefPoint","Ref Point", 10,1252170, 1252180);
-  Add2RawsList( fhRefPoint,0, expert, image, !saveCorr);
+  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 * fhRawLEDcalpmt[24]; 
-  TH1F *fhRawCFDpmt[24]; TH1F * fhRawLEDpmt[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++)
     {
@@ -171,40 +184,46 @@ void AliT0QADataMakerRec::InitRaws()
       qt0name = "hRawQT0_";
       qt1name = "hRawQT1_";
       ampname = "hRawLEDminCFD";
+      nhits = "hRawNhits";
       timename += i+1;
       ampname += i+1;
       qtcname += i+1;
       qt0name += i+1;
       qt1name += i+1;
       ledname += i+1;
-      //      fhRawCFD[i] = new TH1F(timename.Data(), Form("%s;CFD [#channels];Counts", timename.Data()),10000,0,10000);
-      fhRawCFD[i] = new TH1F(timename.Data(), Form("%s;CFD [#channels];Counts", timename.Data()),10000,80000,100000);
-      Add2RawsList( fhRawCFD[i],i+1, expert, !image, !saveCorr);
-      fhRawLED[i] = new TH1F(ledname.Data(),  Form("%s;LED[#channels];Counts", ledname.Data()),10000,80000,100000);
+      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);
+     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()),10000,80000,100000);
-      fhRawQT1[i] = new TH1F(qt1name.Data(),  Form("%s;QT1[#channels];Counts", qtcname.Data()),10000,80000,100000);
-      Add2RawsList( fhRawQT1[i],270+i, expert, !image, !saveCorr);
-      fhRawQT0[i] = new TH1F(qt1name.Data(),  Form("%s;QT0[#channels];Counts", qtcname.Data()),10000,80000,100000);
-      // fhRawQT0[i] = new TH1F(qt1name.Data(),  Form("%s;QT0[#channels];Counts", qtcname.Data()),10000,0,10000);
-      Add2RawsList( fhRawQT0[i],270+24+i, 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;", 10000,80000,100000);
+  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", 10000,80000,100000);
+
+  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", 10000,80000,100000);
+
+  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", 10000,80000,100000);
+  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
@@ -220,23 +239,26 @@ void AliT0QADataMakerRec::InitRaws()
       qtcCalname += i+1;
       qt0Calname += i+1;
       qt1Calname += i+1;
-      //     fhRawCFDcal[i] = new TH1F(timeCalname.Data(),  Form("%s;Time ;Counts", timeCalname.Data()),10000,0,10000);
-      fhRawCFDcal[i] = new TH1F(timeCalname.Data(),  Form("%s;Time ;Counts", timeCalname.Data()),10000,60000,80000);
+      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()),10000,0,10000);
-     fhRawLEDcal[i] = new TH1F(ledCalname.Data(),  Form("%s;Time ;Counts", ledCalname.Data()),10000,60000,80000);
+     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()),10000,60000,80000);
-      //fhRawQT0cal[i] = new TH1F(qt0Calname.Data(), Form("%s;Charge ;Counts",qt0Calname.Data()),10000,0,10000);
+
+      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()),10000,60000,80000);
-      //fhRawQT1cal[i] = new TH1F(qt1Calname.Data(), Form("%s;Charge ;Counts",qt1Calname.Data()),10000,0,10000);
+
+      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);
-    }
+
+      }
 
   //from PMT1 (equalizing)
   for (Int_t i=0; i<24; i++)
@@ -249,59 +271,88 @@ void AliT0QADataMakerRec::InitRaws()
       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);
+       Add2RawsList( fhRawCFDcalpmt[i],321+i , expert, !image, !saveCorr);
 
       fhRawCFDpmt[i] = new TH1F(timename.Data(),  Form("%s;Time;Counts", timename.Data()),2000,-1000,1000);
-      Add2RawsList( fhRawCFDcalpmt[i],220+i, expert, !image, !saveCorr);
-  }
+      Add2RawsList( fhRawCFDpmt[i],220+i, expert, !image, !saveCorr);
+     }
 
   TH1F* fhRawTriggerCal = new TH1F("hRawTriggerCal"," laser triggers",6,0,6);
-  Add2RawsList(fhRawTriggerCal ,197 , expert, image, !saveCorr);
-
-  TH1F* fhRawMeanCal = new TH1F("hRawMeanCal","online mean signal, calibration event",
-                               10000,60000,80000);
+  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);
-  TH1F* fhRawVertexCal = new TH1F("hRawVertexCal","online vertex signal, calibration event ",  10000,60000,80000);
-  // TH1F* fhRawVertexCal = new TH1F("hRawVertexCal","online vertex signal, calibration event ",  10000,0,10000);
-  Add2RawsList( fhRawVertexCal,199, expert, !image, !saveCorr);
-  TH1F* fhRawORAcal = new TH1F("hRawORAcal","laser OR A; counts", 10000,60000,80000);
-  // TH1F* fhRawORAcal = new TH1F("hRawORAcal","laser OR A; counts", 10000,0,10000);
-  Add2RawsList( fhRawORAcal,200, expert, !image, !saveCorr );
-  TH1F* fhRawORCcal = new TH1F("hRawORCcal","laserOR C;counts ", 10000,60000,80000);
-  // TH1F* fhRawORCcal = new TH1F("hRawORCcal","laserOR C;counts ", 10000,0,10000);
-  Add2RawsList( fhRawORCcal,201, expert, !image, !saveCorr);
+  TH1F* fhRawVertexCal = new TH1F("hRawVertexCal","online vertex signal, calibration event ", high[199]-low[199],low[199],high[199] );
+   Add2RawsList( fhRawVertexCal,199, expert, !image, !saveCorr);
+  TH1F* fhRawORAcal = new TH1F("hRawORAcal","laser OR A; counts", high[200]-low[200],low[200],high[200]);
+   Add2RawsList( fhRawORAcal,200, 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);
 
   //multiplicity trigger
-  TH1F* fhMultcal = new TH1F("hMultcal","full mulltiplicity;Multiplicity;Entries", 10000,60000,80000);
+  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("hMultScal","full multiplicity with semi-central trigger;Multiplicity;Entries",
-                             10000,60000,80000);
+   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("hMultCcal","full multiplicity with central trigger;Multiplicity;Entries", 
-                             10000,60000,80000);
+  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* fhEffCFD = new TH1F("hEffCFD","#PMT; #CFD counts/nEvents",24, 0 ,24); 
+  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* fhEffLED = new TH1F("hEffLED","#PMT; #LED counts/nEvent",24, 0 ,24);   
+  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, 5000,60000,80000);
-  //TH2F* fhCFDcal = new TH2F("hCFDcal","CFD laser; #PMT; CFD {#channnels}",25, 0 ,25, 2000,0,10000);
+  
+  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, 5000,60000,80000);
-  // TH2F* fhLEDcal = new TH2F("hLEDcal","LED laser; #PMT; LED [#channnels]",25, 0 ,25, 2000,0,10000);
+  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);
+  Add2RawsList( fhLEDcal,209, !expert, image, !saveCorr);
+
+
+  TH1F* fhNumPMTA= new TH1F("hNumPMTA","number of PMT hitted per event",10, 0 ,10);
+  Add2RawsList(fhNumPMTA ,211, expert, !image, !saveCorr);
+
+  TH1F* fhNumPMTC= new TH1F("hNumPMTC","number of PMT hitted per event",10, 0 ,10);
+  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(197)->Fill(triggers[itr], fNumTriggersCal[itr]);
-    GetRawsData(197)->SetBinContent(itr+1, fNumTriggersCal[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]);
   }  
@@ -393,24 +444,34 @@ void AliT0QADataMakerRec::MakeRaws( AliRawReader* rawReader)
       
       if (allData[0][0] > 0 ) GetRawsData(0) -> Fill( allData[0][0]);
  
-        if (refPointParam <  0 ) refpoint=0; 
-         else
-           refpoint = allData[0][0] - 5000;
-    
-      for (Int_t ik = 0; ik<12; ik++){
+      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);
            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);
@@ -421,32 +482,45 @@ void AliT0QADataMakerRec::MakeRaws( AliRawReader* rawReader)
          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+26][iHt]-allData[2*ik+25][iHt]);
-           GetRawsData(shift+ik+270)->Fill(allData[2*ik+26][iHt]);
-           GetRawsData(shift+ik+24+270)->Fill(allData[2*ik+25][iHt]);
+             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);
       }
-      for (Int_t ik = 12; ik<24; ik++) {
+      Int_t numPmtA=0;    
+       for (Int_t ik = 12; ik<24; ik++) {
+       //      for (Int_t iHt=0; iHt<1; iHt++) {
+       if(allData[ik+1][0]>0 && type == 7 ) numPmtA++;
+       Int_t nhitsPMT=0;
+       if(allData[ik+1][0]>0) numPmtA++;
        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);
            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);
@@ -455,10 +529,9 @@ void AliT0QADataMakerRec::MakeRaws( AliRawReader* rawReader)
            //qtc         
          if(allData[2*ik+57][iHt]>0 || allData[2*ik+58][iHt]>0)
            {
-             GetRawsData(shift+ik+72+1)-> Fill(allData[2*ik+58][iHt]-allData[2*ik+57][iHt]);
-             
-             GetRawsData(shift+ik+270)->Fill(allData[2*ik+26][iHt]);
-             GetRawsData(shift+ik+24+270)->Fill(allData[2*ik+25][iHt]);
+             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
@@ -466,41 +539,60 @@ void AliT0QADataMakerRec::MakeRaws( AliRawReader* rawReader)
            GetRawsData(shift+ik+48+1)->
              Fill(allData[ik+57][iHt]-allData[ik+45][iHt]);
        }
+       if(type == 7  ) GetRawsData(ik+244)->Fill(nhitsPMT);
+
       }
       
       Int_t trChannel[6] = {49,50,51,52,55,56};  
        
       if(type == 7)
        {
-         for (Int_t iHt=0; iHt<6; iHt++) {
+         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) {
+             if (allData[trChannel[itr]][iHt] >0) {
                fNumTriggers[itr]++;
-               GetRawsData(98+itr)->Fill(allData[trChannel[itr]][iHt]);
+               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[51][iHt]-allData[52][iHt]);
          }
+         GetRawsData(213)->Fill(nhitsOrA);
+         GetRawsData(214)->Fill(nhitsOrC);
+         
        }
       
-        if(type == 8)
+      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]);
+                   GetRawsData(198+itr)->
+                     Fill(allData[trChannel[itr]][iHt]-refpoint);
                    fNumTriggersCal[itr]++;
                  }
              }
              if(allData[53][iHt]>0 && allData[54][iHt]>0) {
-               GetRawsData(204)->Fill(allData[53][iHt]-allData[54][iHt]);
+               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(203)->Fill(allData[53][iHt]-allData[54][iHt]);
+               if(allData[56][iHt]>0) GetRawsData(204)->Fill(allData[53][iHt]-allData[54][iHt]);
              }
            }
          } 
-       
+      
            delete start;
     }
 }