X-Git-Url: http://git.uio.no/git/?a=blobdiff_plain;f=VZERO%2FAliVZEROQADataMakerRec.cxx;h=580f2058530cd8c4b093896d047ed18b69c5a725;hb=1b1f5ae600c6087be4f8449b6f46d4c6773a7529;hp=882f7de6489787e98919ce6953934f18d6703eed;hpb=6252ceeb59406d4f518422dfad532f414e0a23c4;p=u%2Fmrichter%2FAliRoot.git diff --git a/VZERO/AliVZEROQADataMakerRec.cxx b/VZERO/AliVZEROQADataMakerRec.cxx index 882f7de6489..580f2058530 100644 --- a/VZERO/AliVZEROQADataMakerRec.cxx +++ b/VZERO/AliVZEROQADataMakerRec.cxx @@ -22,12 +22,14 @@ // --- ROOT system --- #include #include +#include #include #include #include #include #include #include +#include // --- Standard library --- @@ -42,9 +44,25 @@ #include "AliRawReader.h" #include "AliVZERORawStream.h" #include "AliVZEROdigit.h" +#include "AliVZEROConst.h" #include "AliVZEROReconstructor.h" +#include "AliVZEROTrending.h" +#include "AliVZEROCalibData.h" +#include "AliCTPTimeParams.h" #include "event.h" + const Float_t kMinBBA = 68. ; + const Float_t kMaxBBA = 100. ; + const Float_t kMinBBC = 75.5 ; + const Float_t kMaxBBC = 100. ; + const Float_t kMinBGA = 54. ; + const Float_t kMaxBGA = 58. ; + const Float_t kMinBGC = 69.5 ; + const Float_t kMaxBGC = 74. ; + + + + ClassImp(AliVZEROQADataMakerRec) @@ -52,16 +70,25 @@ ClassImp(AliVZEROQADataMakerRec) AliVZEROQADataMakerRec::AliVZEROQADataMakerRec() : AliQADataMakerRec(AliQAv1::GetDetName(AliQAv1::kVZERO), "VZERO Quality Assurance Data Maker"), fCalibData(0x0), - fEvent(0) + fEvent(0), + fNTotEvents(0), + fNSubEvents(0), + fTrendingUpdateEvent(0), + fNTrendingUpdates(0), + fTrendingUpdateTime(0), + fCycleStartTime(0), + fCycleStopTime(0), + fTimeSlewing(0) { // Constructor AliDebug(AliQAv1::GetQADebugLevel(), "Construct VZERO QA Object"); - + for(Int_t i=0; i<64; i++){ fEven[i] = 0; - fOdd[i] = 0; } + fOdd[i] = 0; + } for(Int_t i=0; i<128; i++){ fADCmean[i] = 0.0; } @@ -71,7 +98,15 @@ ClassImp(AliVZEROQADataMakerRec) AliVZEROQADataMakerRec::AliVZEROQADataMakerRec(const AliVZEROQADataMakerRec& qadm) : AliQADataMakerRec(), fCalibData(0x0), - fEvent(0) + fEvent(0), + fNTotEvents(0), + fNSubEvents(0), + fTrendingUpdateEvent(0), + fNTrendingUpdates(0), + fTrendingUpdateTime(0), + fCycleStartTime(0), + fCycleStopTime(0), + fTimeSlewing(0) { // Copy constructor @@ -125,34 +160,17 @@ void AliVZEROQADataMakerRec::EndOfDetectorCycle(AliQAv1::TASKINDEX_t task, TObjA // Does the QA checking AliQAChecker::Instance()->Run(AliQAv1::kVZERO, task, list) ; + + if(task == AliQAv1::kRAWS){ + TTimeStamp currentTime; + fCycleStopTime = currentTime.GetSec(); + } for (Int_t specie = 0 ; specie < AliRecoParam::kNSpecies ; specie++) { if (! IsValidEventSpecie(specie, list)) continue ; SetEventSpecie(AliRecoParam::ConvertIndex(specie)) ; if(task == AliQAv1::kRAWS){ - int nMaxBin = GetRawsData(kPedestalTimeInt0)->GetNbinsY(); - if(fCurrentCycle%nMaxBin==0) { - GetRawsData(kPedestalTimeInt0)->Reset(); - GetRawsData(kPedestalTimeInt1)->Reset(); - GetRawsData(kChargeEoITimeInt0)->Reset(); - GetRawsData(kChargeEoITimeInt1)->Reset(); - } - TH1D* hProj; - char name[50]; - for(Int_t iChannel=0; iChannel<64; iChannel++) { - for(Int_t integrator=0;integrator<2;integrator++){ - sprintf(name,"Ped_%d_%d",iChannel,integrator); - hProj = ((TH2I*)GetRawsData((integrator == 0 ? kPedestalCycleInt0 : kPedestalCycleInt1)))->ProjectionY(name,iChannel+1,iChannel+1); - ((TH2D*)GetRawsData((integrator == 0 ? kPedestalTimeInt0 : kPedestalTimeInt1)))->Fill((double)iChannel,(double)(fCurrentCycle%nMaxBin),(double)hProj->GetMean()); - delete hProj; - - sprintf(name,"Charge_%d_%d",iChannel,integrator); - hProj = ((TH2I*)GetRawsData((integrator == 0 ? kChargeEoICycleInt0 : kChargeEoICycleInt1)))->ProjectionY(name,iChannel+1,iChannel+1); - ((TH2D*)GetRawsData((integrator == 0 ? kChargeEoITimeInt0 : kChargeEoITimeInt1)))->Fill((double)iChannel,(double)(fCurrentCycle%nMaxBin),hProj->GetMean()); - delete hProj; - } - } } else if (task == AliQAv1::kESDS) { } } @@ -194,16 +212,16 @@ void AliVZEROQADataMakerRec::InitESDs() h2d = new TH2D("H2D_Charge_Channel", "ADC Charge per channel;Channel;Charge (ADC counts)",64, 0, 64, 1024, 0, 1024) ; Add2ESDsList(h2d, kChargeChannel, !expert, image) ; - h2d = new TH2D("H2D_Time_Channel", "Time per channel;Channel;Time (ns)",64, 0, 64, 820, 0, 410) ; + h2d = new TH2D("H2D_Time_Channel", "Time per channel;Channel;Time (ns)",64, 0, 64, 400, -100, 100) ; Add2ESDsList(h2d, kTimeChannel, !expert, image) ; - h1d = new TH1D("H1D_V0A_Time", "Mean V0A Time;Time (ns);Counts",2048, 0., 409.6); + h1d = new TH1D("H1D_V0A_Time", "Mean V0A Time;Time (ns);Counts",1000, -100., 100.); Add2ESDsList(h1d,kESDV0ATime, !expert, image); - h1d = new TH1D("H1D_V0C_Time", "Mean V0C Time;Time (ns);Counts",2048, 0., 409.6); + h1d = new TH1D("H1D_V0C_Time", "Mean V0C Time;Time (ns);Counts",1000, -100., 100.); Add2ESDsList(h1d,kESDV0CTime, !expert, image); - h1d = new TH1D("H1D_Diff_Time", "Diff Time V0A - V0C;Diff Time V0A - V0C (ns);Counts",2*2048, -409.6, 409.6); + h1d = new TH1D("H1D_Diff_Time", "Diff Time V0A - V0C;Diff Time V0A - V0C (ns);Counts",1000, -200., 200.); Add2ESDsList(h1d,kESDDiffTime, !expert, image); } @@ -212,34 +230,33 @@ void AliVZEROQADataMakerRec::InitESDs() void AliVZEROQADataMakerRec::InitRaws() { // Creates RAW histograms in Raws subdir - + const Bool_t expert = kTRUE ; const Bool_t saveCorr = kTRUE ; const Bool_t image = kTRUE ; - char name[50] , title[100]; const Int_t kNintegrator = 2; - const Int_t kNTdcTimeBins = 2048; - const Int_t kTdcTimeMin = 0; - const Int_t kTdcTimeMax = 4096; + const Int_t kNTdcTimeBins = 1280; + const Float_t kTdcTimeMin = 0.; + const Float_t kTdcTimeMax = 125.; const Int_t kNTdcWidthBins = 128; - const Int_t kTdcWidthMin = 0; - const Int_t kTdcWidthMax = 128; + const Float_t kTdcWidthMin = 0; + const Float_t kTdcWidthMax = 50.; const Int_t kNChargeBins = 1024; - const Int_t kChargeMin = 0; - const Int_t kChargeMax = 1024; + const Float_t kChargeMin = 0; + const Float_t kChargeMax = 1024; const Int_t kNChannelBins = 64; - const Int_t kChannelMin = 0; - const Int_t kChannelMax = 64; + const Float_t kChannelMin = 0; + const Float_t kChannelMax = 64; const Int_t kNPedestalBins = 200; - const Int_t kPedestalMin = 0; - const Int_t kPedestalMax = 200; - const Int_t kTimeMin = 0; - const Int_t kTimeMax = 100; - const Int_t kNMIPBins = 200; - const Int_t kMIPMin = 0; - const Int_t kMIPMax = 200; + const Float_t kPedestalMin = 0; + const Float_t kPedestalMax = 200; + const Float_t kTimeMin = 0; + const Float_t kTimeMax = 100; + const Int_t kNMIPBins = 512; + const Float_t kMIPMin = 0; + const Float_t kMIPMax = 16; TH2I * h2i; TH2D * h2d; @@ -247,91 +264,79 @@ void AliVZEROQADataMakerRec::InitESDs() TH1D * h1d; int iHisto =0; - + // Creation of Trigger Histogram + h1d = new TH1D("H1D_Trigger_Type", "V0 Trigger Type;;Counts", 4,0 ,4) ; + Add2RawsList(h1d,kTriggers, !expert, image, saveCorr); iHisto++; + h1d->SetFillColor(29); + h1d->SetLineWidth(2); + h1d->GetXaxis()->SetLabelSize(0.06); + h1d->GetXaxis()->SetNdivisions(808,kFALSE); + h1d->GetXaxis()->SetBinLabel(1, "V0-AND"); + h1d->GetXaxis()->SetBinLabel(2, "V0-OR"); + h1d->GetXaxis()->SetBinLabel(3, "V0-BGA"); + h1d->GetXaxis()->SetBinLabel(4, "V0-BGC"); + // Creation of Cell Multiplicity Histograms h1i = new TH1I("H1I_Multiplicity_V0A", "Cell Multiplicity in V0A;# of Cells;Entries", 35, 0, 35) ; - Add2RawsList(h1i,kMultiV0A, !expert, image, saveCorr); iHisto++; + Add2RawsList(h1i,kMultiV0A, expert, image, saveCorr); iHisto++; h1i = new TH1I("H1I_Multiplicity_V0C", "Cell Multiplicity in V0C;# of Cells;Entries", 35, 0, 35) ; - Add2RawsList(h1i,kMultiV0C, !expert, image, saveCorr); iHisto++; + Add2RawsList(h1i,kMultiV0C, expert, image, saveCorr); iHisto++; // Creation of Total Charge Histograms - h1d = new TH1D("H1D_Charge_V0A", "Total Charge in V0A;Charge [ADC counts];Counts", 2048, 0, 32768) ; - Add2RawsList(h1d,kChargeV0A, !expert, image, saveCorr); iHisto++; - h1d = new TH1D("H1D_Charge_V0C", "Total Charge in V0C;Charge [ADC counts];Counts", 2048, 0, 32768) ; - Add2RawsList(h1d,kChargeV0C, !expert, image, saveCorr); iHisto++; - h1d = new TH1D("H1D_Charge_V0", "Total Charge in V0;Charge [ADC counts];Counts", 2048, 0, 65536) ; - Add2RawsList(h1d,kChargeV0, !expert, image, saveCorr); iHisto++; + h1d = new TH1D("H1D_Charge_V0A", "Total Charge in V0A;Charge [ADC counts];Counts", 2000, 0, 10000) ; + Add2RawsList(h1d,kChargeV0A, expert, !image, saveCorr); iHisto++; + h1d = new TH1D("H1D_Charge_V0C", "Total Charge in V0C;Charge [ADC counts];Counts", 2000, 0, 10000) ; + Add2RawsList(h1d,kChargeV0C, expert, !image, saveCorr); iHisto++; + h1d = new TH1D("H1D_Charge_V0", "Total Charge in V0;Charge [ADC counts];Counts", 2000, 0, 20000) ; + Add2RawsList(h1d,kChargeV0, expert, !image, saveCorr); iHisto++; // Creation of MIP Histograms - h1d = new TH1D("H1D_MIP_V0A", "Total MIP in V0A;Charge [MIP];Counts", 2*kNMIPBins,kMIPMin ,32*kMIPMax) ; - Add2RawsList(h1d,kRawMIPV0A, !expert, image, saveCorr); iHisto++; - h1d = new TH1D("H1D_MIP_V0C", "Total MIP in V0C;Charge [MIP];Counts", 2*kNMIPBins,kMIPMin ,32*kMIPMax) ; - Add2RawsList(h1d,kRawMIPV0C, !expert, image, saveCorr); iHisto++; - h1d = new TH1D("H1D_MIP_V0", "Total MIP in V0;Charge [MIP];Counts", 2*kNMIPBins,kMIPMin ,32*kMIPMax) ; - Add2RawsList(h1d,kRawMIPV0, !expert, image, saveCorr); iHisto++; + h1d = new TH1D("H1D_MIP_V0A", "Total MIP in V0A;Multiplicity [MIP];Counts", kNMIPBins,kMIPMin ,32*kMIPMax) ; + Add2RawsList(h1d,kRawMIPV0A, expert, !image, saveCorr); iHisto++; + h1d = new TH1D("H1D_MIP_V0C", "Total MIP in V0C;Multiplicity [MIP];Counts", kNMIPBins,kMIPMin ,32*kMIPMax) ; + Add2RawsList(h1d,kRawMIPV0C, expert, !image, saveCorr); iHisto++; + h1d = new TH1D("H1D_MIP_V0", "Total MIP in V0;Multiplicity [MIP];Counts", 2*kNMIPBins,kMIPMin ,64*kMIPMax) ; + Add2RawsList(h1d,kRawMIPV0, expert, !image, saveCorr); iHisto++; h2d = new TH2D("H2D_MIP_Channel", "Nb of MIP per channel;Channel;# of Mips", kNChannelBins, kChannelMin, kChannelMax,kNMIPBins,kMIPMin ,kMIPMax) ; Add2RawsList(h2d,kRawMIPChannel, expert, !image, !saveCorr); iHisto++; + + // Creation of Charge EoI histogram + h2d = new TH2D("H2D_ChargeEoI", "Charge Event of Interest;Channel Number;Charge [ADC counts]" + ,kNChannelBins, kChannelMin, kChannelMax, kNChargeBins, kChargeMin, kChargeMax); + Add2RawsList(h2d,kChargeEoI, !expert, image, !saveCorr); iHisto++; + for(Int_t iInt=0;iIntSetMinimum(0); + Add2RawsList(h1d,kBBFlagsPerChannel, !expert, image, !saveCorr); iHisto++; + + h2d = new TH2D("H2D_BBFlagVsClock", "BB-Flags Versus LHC-Clock;Channel;LHC Clocks",kNChannelBins, kChannelMin, kChannelMax,21, -10.5, 10.5 ); Add2RawsList(h2d,kBBFlagVsClock, expert, !image, !saveCorr); iHisto++; - sprintf(name,"H2D_BGFlagVsClock"); - sprintf(title,"BG-Flags Versus LHC-Clock;Time [ns];??"); - h2d = new TH2D(name, title,kNChannelBins, kChannelMin, kChannelMax,21, -10.5, 10.5 ); + h2d = new TH2D("H2D_BGFlagVsClock", "BG-Flags Versus LHC-Clock;Channel;LHC Clocks",kNChannelBins, kChannelMin, kChannelMax,21, -10.5, 10.5 ); Add2RawsList(h2d,kBGFlagVsClock, expert, !image, !saveCorr); iHisto++; + AliDebug(AliQAv1::GetQADebugLevel(), Form("%d Histograms has been added to the Raws List",iHisto)); } @@ -423,11 +416,8 @@ void AliVZEROQADataMakerRec::InitDigits() const Bool_t expert = kTRUE ; const Bool_t image = kTRUE ; - char TDCname[100]; - char ADCname[100]; TH1I *fhDigTDC[64]; TH1I *fhDigADC[64]; - char texte[100]; // create Digits histograms in Digits subdir TH1I * h0 = new TH1I("hDigitMultiplicity", "Digits multiplicity distribution in VZERO;# of Digits;Entries", 100, 0, 99) ; @@ -436,13 +426,9 @@ void AliVZEROQADataMakerRec::InitDigits() for (Int_t i=0; i<64; i++) { - sprintf(TDCname, "hDigitTDC%d", i); - sprintf(texte,"Digit TDC in cell %d; TDC value;Entries",i); - fhDigTDC[i] = new TH1I(TDCname,texte,300,0.,149.); + fhDigTDC[i] = new TH1I(Form("hDigitTDC%d", i),Form("Digit TDC in cell %d; TDC value;Entries",i),300,0.,149.); - sprintf(ADCname,"hDigitADC%d",i); - sprintf(texte,"Digit ADC in cell %d;ADC value;Entries",i); - fhDigADC[i]= new TH1I(ADCname,texte,1024,0.,1023.); + fhDigADC[i]= new TH1I(Form("hDigitADC%d",i),Form("Digit ADC in cell %d;ADC value;Entries",i),1024,0.,1023.); Add2DigitsList(fhDigTDC[i],i+1, !expert, image); Add2DigitsList(fhDigADC[i],i+1+64, !expert, image); @@ -456,11 +442,11 @@ void AliVZEROQADataMakerRec::MakeDigits() GetDigitsData(0)->Fill(fDigitsArray->GetEntriesFast()) ; TIter next(fDigitsArray) ; - AliVZEROdigit *VZERODigit ; - while ( (VZERODigit = dynamic_cast(next())) ) { - Int_t PMNumber = VZERODigit->PMNumber(); - GetDigitsData(PMNumber +1)->Fill( VZERODigit->Time()) ; // in 100 of picoseconds - GetDigitsData(PMNumber +1+64)->Fill( VZERODigit->ADC()) ; + AliVZEROdigit *aVZERODigit ; + while ( (aVZERODigit = dynamic_cast(next())) ) { + Int_t aPMNumber = aVZERODigit->PMNumber(); + GetDigitsData(aPMNumber +1)->Fill( aVZERODigit->Time()) ; // in 100 of picoseconds + GetDigitsData(aPMNumber +1+64)->Fill( aVZERODigit->ADC()) ; } } @@ -504,35 +490,28 @@ void AliVZEROQADataMakerRec::MakeESDs(AliESDEvent * esd) GetESDsData(kMIPMultiV0A)->Fill(esdVZERO->GetMTotV0A()); GetESDsData(kMIPMultiV0C)->Fill(esdVZERO->GetMTotV0C()); - Float_t timeV0A = 0., timeV0C = 0., diffTime; - Int_t iTimeV0A = 0, iTimeV0C = 0; - for(Int_t i=0;i<64;i++) { GetESDsData(kMIPMultiChannel)->Fill((Float_t) i,(Float_t) esdVZERO->GetMultiplicity(i)); GetESDsData(kChargeChannel)->Fill((Float_t) i,(Float_t) esdVZERO->GetAdc(i)); - if(esdVZERO->GetBBFlag(i)) GetESDsData(kBBFlag)->Fill((Float_t) i); - if(esdVZERO->GetBGFlag(i)) GetESDsData(kBGFlag)->Fill((Float_t) i); - - Float_t time = (Float_t) esdVZERO->GetTime(i)/10.; //Convert in ns: 1 TDC channel = 100ps - GetESDsData(kTimeChannel)->Fill((Float_t) i,time); - - if(time>0.){ - if (i<32) { - iTimeV0C++; - timeV0C += time; - }else{ - iTimeV0A++; - timeV0A += time; - } + if (i < 32) { + if(esdVZERO->BBTriggerV0C(i)) GetESDsData(kBBFlag)->Fill((Float_t) i); + if(esdVZERO->BGTriggerV0C(i)) GetESDsData(kBGFlag)->Fill((Float_t) i); } + else { + if(esdVZERO->BBTriggerV0A(i-32)) GetESDsData(kBBFlag)->Fill((Float_t) i); + if(esdVZERO->BGTriggerV0A(i-32)) GetESDsData(kBGFlag)->Fill((Float_t) i); + } + Float_t time = (Float_t) esdVZERO->GetTime(i); //Convert in ns: 1 TDC channel = 100ps + GetESDsData(kTimeChannel)->Fill((Float_t) i,time); } - if(iTimeV0A>0) timeV0A /= iTimeV0A; - else timeV0A = -1.; - if(iTimeV0C>0) timeV0C /= iTimeV0C; - else timeV0C = -1.; - if(timeV0A<0. || timeV0C<0.) diffTime = -10000.; - else diffTime = timeV0A - timeV0C; + Float_t timeV0A = esdVZERO->GetV0ATime(); + Float_t timeV0C = esdVZERO->GetV0CTime(); + Float_t diffTime; + + if(timeV0A<-1024.+1.e-6 || timeV0C<-1024.+1.e-6) diffTime = -1024.; + else diffTime = timeV0A - timeV0C; + GetESDsData(kESDV0ATime)->Fill(timeV0A); GetESDsData(kESDV0CTime)->Fill(timeV0C); GetESDsData(kESDDiffTime)->Fill(diffTime); @@ -547,19 +526,21 @@ void AliVZEROQADataMakerRec::MakeESDs(AliESDEvent * esd) { // Fills histograms with Raws, computes average ADC values dynamically (pedestal subtracted) + // Check id histograms already created for this Event Specie if ( ! GetRawsData(kPedestalInt0) ) InitRaws() ; rawReader->Reset() ; AliVZERORawStream* rawStream = new AliVZERORawStream(rawReader); - rawStream->Next(); - + if(!(rawStream->Next())) return; + eventTypeType eventType = rawReader->GetType(); Int_t mulV0A = 0 ; Int_t mulV0C = 0 ; Double_t timeV0A =0., timeV0C = 0.; + Double_t weightV0A =0., weightV0C = 0.; UInt_t itimeV0A=0, itimeV0C=0; Double_t chargeV0A=0., chargeV0C=0.; Double_t mipV0A=0., mipV0C=0.; @@ -569,15 +550,18 @@ void AliVZEROQADataMakerRec::MakeESDs(AliESDEvent * esd) switch (eventType){ case PHYSICS_EVENT: + + fNTotEvents++; + Int_t iFlag=0; Int_t pedestal; Int_t integrator; - Bool_t BBFlag; - Bool_t BGFlag; - UInt_t time, width; - Int_t MBCharge, charge; + Bool_t flagBB[64]; + Bool_t flagBG[64]; + Int_t mbCharge; + Float_t charge; Int_t offlineCh; - TH1D * hProj; + Float_t adc[64], time[64], width[64], timeCorr[64]; for(Int_t iChannel=0; iChannel<64; iChannel++) { // BEGIN : Loop over channels @@ -591,57 +575,86 @@ void AliVZEROQADataMakerRec::MakeESDs(AliESDEvent * esd) if(iFlag == 0){ //No Flag found for(Int_t j=15; j<21; j++){ - pedestal=rawStream->GetPedestal(iChannel, j); + pedestal= (Int_t) rawStream->GetPedestal(iChannel, j); integrator = rawStream->GetIntegratorFlag(iChannel, j); GetRawsData((integrator == 0 ? kPedestalInt0 : kPedestalInt1))->Fill(offlineCh,pedestal); - GetRawsData((integrator == 0 ? kPedestalCycleInt0 : kPedestalCycleInt1))->Fill(offlineCh,pedestal); } } // Fill Charge EoI histograms - // Look for the maximum in the LHC clock train - charge = 0; - Int_t iClock = 0; - Int_t iCharge = 0; - for(Int_t iEvent=0; iEvent<21; iEvent++){ - iCharge = rawStream->GetPedestal(iChannel,iEvent); - if(iCharge>charge) { - charge = iCharge; - iClock = iEvent; - } - } // End of maximum searching procedure + adc[offlineCh] = 0.0; + + // Search for the maximum charge in the train of 21 LHC clocks + // regardless of the integrator which has been operated: + Float_t maxadc = 0; + Int_t imax = -1; + Float_t adcPedSub[21]; + for(Int_t iClock=0; iClock<21; iClock++){ + Bool_t iIntegrator = rawStream->GetIntegratorFlag(iChannel,iClock); + Int_t k = offlineCh+64*iIntegrator; + + //printf(Form("clock = %d adc = %f ped %f\n",iClock,rawStream->GetPedestal(iChannel,iClock),fPedestal[k])); + + adcPedSub[iClock] = rawStream->GetPedestal(iChannel,iClock) - fCalibData->GetPedestal(k); +// if(adcPedSub[iClock] <= GetRecoParam()->GetNSigmaPed()*fCalibData->GetSigma(k)) { + if(adcPedSub[iClock] <= 2.*fCalibData->GetSigma(k)) { + adcPedSub[iClock] = 0; + continue; + } +// if(iClock < GetRecoParam()->GetStartClock() || iClock > GetRecoParam()->GetEndClock()) continue; + if(iClock < 8 || iClock > 12) continue; + if(adcPedSub[iClock] > maxadc) { + maxadc = adcPedSub[iClock]; + imax = iClock; + } + } + //printf(Form("Channel %d (online), %d (offline)\n",iChannel,j)); + if (imax != -1) { +// Int_t start = imax - GetRecoParam()->GetNPreClocks(); + Int_t start = imax - 2; + if (start < 0) start = 0; +// Int_t end = imax + GetRecoParam()->GetNPostClocks(); + Int_t end = imax + 1; + if (end > 20) end = 20; + for(Int_t iClock = start; iClock <= end; iClock++) { + adc[offlineCh] += adcPedSub[iClock]; + } + } + + + Int_t iClock = imax; + charge = rawStream->GetPedestal(iChannel,iClock); // Charge at the maximum integrator = rawStream->GetIntegratorFlag(iChannel,iClock); - BBFlag = rawStream->GetBBFlag(iChannel, iClock); - BGFlag = rawStream->GetBGFlag(iChannel,iClock ); + flagBB[offlineCh] = rawStream->GetBBFlag(iChannel, iClock); + flagBG[offlineCh] = rawStream->GetBGFlag(iChannel,iClock ); + Int_t board = AliVZEROCalibData::GetBoardNumber(offlineCh); + time[offlineCh] = rawStream->GetTime(iChannel)*fCalibData->GetTimeResolution(board); + width[offlineCh] = rawStream->GetWidth(iChannel)*fCalibData->GetWidthResolution(board); + + if (time[offlineCh] >= 1e-6) GetRawsData(kChargeEoI)->Fill(offlineCh,adc[offlineCh]); GetRawsData((integrator == 0 ? kChargeEoIInt0 : kChargeEoIInt1))->Fill(offlineCh,charge); - if(BBFlag) GetRawsData((integrator == 0 ? kChargeEoIBBInt0 : kChargeEoIBBInt1))->Fill(offlineCh,charge); - if(BGFlag) GetRawsData((integrator == 0 ? kChargeEoIBGInt0 : kChargeEoIBGInt1))->Fill(offlineCh,charge); + if(flagBB[offlineCh]) GetRawsData((integrator == 0 ? kChargeEoIBBInt0 : kChargeEoIBBInt1))->Fill(offlineCh,charge); + if(flagBG[offlineCh]) GetRawsData((integrator == 0 ? kChargeEoIBGInt0 : kChargeEoIBGInt1))->Fill(offlineCh,charge); - hProj = ((TH2I*)GetRawsData((integrator == 0 ? kPedestalInt0 : kPedestalInt1)))->ProjectionY("",offlineCh+1,offlineCh+1); - Double_t ped = hProj->GetMean(); - Double_t sigma = hProj->GetRMS(); - delete hProj; + Float_t sigma = fCalibData->GetSigma(offlineCh+64*integrator); - Double_t chargeEoI = charge - ped; // Calculation of the number of MIP - Double_t mipEoI = chargeEoI * fCalibData->GetMIPperADC(offlineCh); + Double_t mipEoI = adc[offlineCh] * fCalibData->GetMIPperADC(offlineCh); - - if(charge<1023 && chargeEoI > 5.*sigma){ - ((TH2I*)GetRawsData((integrator == 0 ? kChargeEoICycleInt0 : kChargeEoICycleInt1)))->Fill(offlineCh,chargeEoI); + if((adc[offlineCh] > 2.*sigma) && !(time[offlineCh] <1.e-6)){ ((TH2D*)GetRawsData(kRawMIPChannel))->Fill(offlineCh,mipEoI); if(offlineCh<32) { mulV0C++; - chargeV0C += chargeEoI; + chargeV0C += adc[offlineCh]; mipV0C += mipEoI; } else { mulV0A++; - chargeV0A += chargeEoI; + chargeV0A += adc[offlineCh]; mipV0A += mipEoI; } } @@ -651,94 +664,129 @@ void AliVZEROQADataMakerRec::MakeESDs(AliESDEvent * esd) int idx; for(Int_t iBunch=0; iBunch<10; iBunch++){ integrator = rawStream->GetIntMBFlag(iChannel, iBunch); - BBFlag = rawStream->GetBBMBFlag(iChannel, iBunch); - BGFlag = rawStream->GetBGMBFlag(iChannel, iBunch); - MBCharge = rawStream->GetChargeMB(iChannel, iBunch); + bool bbFlag = rawStream->GetBBMBFlag(iChannel, iBunch); + bool bgFlag = rawStream->GetBGMBFlag(iChannel, iBunch); + mbCharge = rawStream->GetChargeMB(iChannel, iBunch); if(integrator==0){ - if(BBFlag==0){ - if(BGFlag==0) idx = kChargeMBBB0BG0Int0; + if(bbFlag==0){ + if(bgFlag==0) idx = kChargeMBBB0BG0Int0; else idx = kChargeMBBB0BG1Int0; } else { - if(BGFlag==0) idx = kChargeMBBB1BG0Int0; + if(bgFlag==0) idx = kChargeMBBB1BG0Int0; else idx = kChargeMBBB1BG1Int0; } } else { - if(BBFlag==0){ - if(BGFlag==0) idx = kChargeMBBB0BG0Int1; + if(bbFlag==0){ + if(bgFlag==0) idx = kChargeMBBB0BG0Int1; else idx = kChargeMBBB0BG1Int1; } else { - if(BGFlag==0) idx = kChargeMBBB1BG0Int1; + if(bgFlag==0) idx = kChargeMBBB1BG0Int1; else idx = kChargeMBBB1BG1Int1; } } - GetRawsData(idx)->Fill(offlineCh,MBCharge); - } + GetRawsData(idx)->Fill(offlineCh,mbCharge); + } // Fill HPTDC Time Histograms - - BBFlag = rawStream->GetBBFlag(iChannel, 10); - BGFlag = rawStream->GetBGFlag(iChannel, 10); - time = rawStream->GetTime(iChannel); - width = rawStream->GetWidth(iChannel); - - if(time>0.){ - if (offlineCh<32) { - itimeV0C++; - timeV0C += time; - }else{ - itimeV0A++; - timeV0A += time; - } + timeCorr[offlineCh] = CorrectLeadingTime(offlineCh,time[offlineCh],adc[offlineCh]); + + const Float_t p1 = 2.50; // photostatistics term in the time resolution + const Float_t p2 = 3.00; // slewing related term in the time resolution + if(timeCorr[offlineCh]>-1024 + 1.e-6){ + Float_t nphe = adc[offlineCh]*kChargePerADC/(fCalibData->GetGain(offlineCh)*TMath::Qe()); + Float_t timeErr = 0; + if (nphe>1.e-6) timeErr = TMath::Sqrt(kIntTimeRes*kIntTimeRes+ + p1*p1/nphe+ + p2*p2*(fTimeSlewing->GetParameter(0)*fTimeSlewing->GetParameter(1))*(fTimeSlewing->GetParameter(0)*fTimeSlewing->GetParameter(1))* + TMath::Power(adc[offlineCh]/fCalibData->GetDiscriThr(offlineCh),2.*(fTimeSlewing->GetParameter(1)-1.))/ + (fCalibData->GetDiscriThr(offlineCh)*fCalibData->GetDiscriThr(offlineCh))); + + if (timeErr>1.e-6) { + if (offlineCh<32) { + itimeV0C++; + timeV0C += timeCorr[offlineCh]/(timeErr*timeErr); + weightV0C += 1./(timeErr*timeErr); + }else{ + itimeV0A++; + timeV0A += timeCorr[offlineCh]/(timeErr*timeErr); + weightV0A += 1./(timeErr*timeErr); + } + } } - GetRawsData(kHPTDCTime)->Fill(offlineCh,time); - GetRawsData(kWidth)->Fill(offlineCh,width); - if(BBFlag) { - GetRawsData(kHPTDCTimeBB)->Fill(offlineCh,time); - GetRawsData(kWidthBB)->Fill(offlineCh,width); - } - if(BGFlag) { - GetRawsData(kHPTDCTimeBG)->Fill(offlineCh,time); - GetRawsData(kWidthBG)->Fill(offlineCh,width); - } + GetRawsData(kHPTDCTime)->Fill(offlineCh,timeCorr[offlineCh]); + GetRawsData(kWidth)->Fill(offlineCh,width[offlineCh]); + if(flagBB[offlineCh]) { + GetRawsData(kHPTDCTimeBB)->Fill(offlineCh,timeCorr[offlineCh]); + GetRawsData(kWidthBB)->Fill(offlineCh,width[offlineCh]); + } + if(flagBG[offlineCh]) { + GetRawsData(kHPTDCTimeBG)->Fill(offlineCh,timeCorr[offlineCh]); + GetRawsData(kWidthBG)->Fill(offlineCh,width[offlineCh]); + } // Fill Flag and Charge Versus LHC-Clock histograms for(Int_t iEvent=0; iEvent<21; iEvent++){ charge = rawStream->GetPedestal(iChannel,iEvent); integrator = rawStream->GetIntegratorFlag(iChannel,iEvent); - BBFlag = rawStream->GetBBFlag(iChannel, iEvent); - BGFlag = rawStream->GetBGFlag(iChannel,iEvent ); + bool bbFlag = rawStream->GetBBFlag(iChannel, iEvent); + bool bgFlag = rawStream->GetBGFlag(iChannel,iEvent ); ((TH2*) GetRawsData((integrator == 0 ? kChargeVsClockInt0 : kChargeVsClockInt1 )))->Fill(offlineCh,(float)iEvent-10,(float)charge); - ((TH2*) GetRawsData(kBBFlagVsClock))->Fill(offlineCh,(float)iEvent-10,(float)BBFlag); - ((TH2*) GetRawsData(kBGFlagVsClock))->Fill(offlineCh,(float)iEvent-10,(float)BGFlag); + ((TH2*) GetRawsData(kBBFlagVsClock))->Fill(offlineCh,(float)iEvent-10,(float)bbFlag); + ((TH2*) GetRawsData(kBGFlagVsClock))->Fill(offlineCh,(float)iEvent-10,(float)bgFlag); + if(iEvent==10) ((TH1*) GetRawsData(kBBFlagsPerChannel))->Fill(offlineCh,(float)bbFlag); } }// END of Loop over channels - if(itimeV0A>0) timeV0A /= (itimeV0A * 10); // itimeV0A Channels and divide by 10 to have the result in ns because 1 TDC Channel = 100 ps - else timeV0A = -1.; - if(itimeV0C>0) timeV0C /= (itimeV0C * 10); - else timeV0C = -1.; - if(timeV0A<0. || timeV0C<0.) diffTime = -10000.; - else diffTime = timeV0A - timeV0C; - - GetRawsData(kV0ATime)->Fill(timeV0A); - GetRawsData(kV0CTime)->Fill(timeV0C); - GetRawsData(kDiffTime)->Fill(diffTime); + if(weightV0A>1.e-6) timeV0A /= weightV0A; + else timeV0A = -1024.; + if(weightV0C>1.e-6) timeV0C /= weightV0C; + else timeV0C = -1024.; + if(timeV0A<-1024.+1.e-6 || timeV0C<-1024.+1.e-6) diffTime = -1024.; + else diffTime = timeV0A - timeV0C; + + Bool_t v0ABB = kFALSE; + Bool_t v0CBB = kFALSE; + Bool_t v0ABG = kFALSE; + Bool_t v0CBG = kFALSE; - GetRawsData(kMultiV0A)->Fill(mulV0A); - GetRawsData(kMultiV0C)->Fill(mulV0C); + if(timeV0A>kMinBBA && timeV0AkMinBGA && timeV0AkMinBBC && timeV0CkMinBGC && timeV0CFill(chargeV0A); - GetRawsData(kChargeV0C)->Fill(chargeV0C); - GetRawsData(kChargeV0)->Fill(chargeV0A + chargeV0C); +// Fill Trigger output histogram + if(v0ABB && v0CBB) GetRawsData(kTriggers)->Fill(0); + if((v0ABB || v0CBB) && !(v0ABG || v0CBG)) GetRawsData(kTriggers)->Fill(1); + if(v0ABG && v0CBB) GetRawsData(kTriggers)->Fill(2); + if(v0ABB && v0CBG) GetRawsData(kTriggers)->Fill(3); - GetRawsData(kRawMIPV0A)->Fill(mipV0A); - GetRawsData(kRawMIPV0C)->Fill(mipV0C); - GetRawsData(kRawMIPV0)->Fill(mipV0A + mipV0C); - break; + + GetRawsData(kV0ATime)->Fill(timeV0A); + GetRawsData(kV0CTime)->Fill(timeV0C); + GetRawsData(kDiffTime)->Fill(diffTime); + GetRawsData(kTimeV0AV0C)->Fill(timeV0A,timeV0C); + + GetRawsData(kMultiV0A)->Fill(mulV0A); + GetRawsData(kMultiV0C)->Fill(mulV0C); + + GetRawsData(kChargeV0A)->Fill(chargeV0A); + GetRawsData(kChargeV0C)->Fill(chargeV0C); + GetRawsData(kChargeV0)->Fill(chargeV0A + chargeV0C); + + GetRawsData(kRawMIPV0A)->Fill(mipV0A); + GetRawsData(kRawMIPV0C)->Fill(mipV0C); + GetRawsData(kRawMIPV0)->Fill(mipV0A + mipV0C); + break; } // END of SWITCH : EVENT TYPE @@ -789,15 +837,70 @@ void AliVZEROQADataMakerRec::StartOfDetectorCycle() // Reset of the histogram used - to have the trend versus time - fCalibData = GetCalibData(); + + AliCDBEntry *entry = AliCDBManager::Instance()->Get("GRP/CTP/CTPtiming"); + if (!entry) AliFatal("CTP timing parameters are not found in OCDB !"); + AliCTPTimeParams *ctpParams = (AliCTPTimeParams*)entry->GetObject(); + Float_t l1Delay = (Float_t)ctpParams->GetDelayL1L0()*25.0; + + AliCDBEntry *entry1 = AliCDBManager::Instance()->Get("GRP/CTP/TimeAlign"); + if (!entry1) AliFatal("CTP time-alignment is not found in OCDB !"); + AliCTPTimeParams *ctpTimeAlign = (AliCTPTimeParams*)entry1->GetObject(); + l1Delay += ((Float_t)ctpTimeAlign->GetDelayL1L0()*25.0); + + AliCDBEntry *entry2 = AliCDBManager::Instance()->Get("VZERO/Calib/TimeDelays"); + if (!entry2) AliFatal("VZERO time delays are not found in OCDB !"); + TH1F *delays = (TH1F*)entry2->GetObject(); + + AliCDBEntry *entry3 = AliCDBManager::Instance()->Get("VZERO/Calib/TimeSlewing"); + if (!entry3) AliFatal("VZERO time slewing function is not found in OCDB !"); + fTimeSlewing = (TF1*)entry3->GetObject(); + + for(Int_t i = 0 ; i < 64; ++i) { + //Int_t board = AliVZEROCalibData::GetBoardNumber(i); + fTimeOffset[i] = ( + // ((Float_t)fCalibData->GetTriggerCountOffset(board) - + // (Float_t)fCalibData->GetRollOver(board))*25.0 + + // fCalibData->GetTimeOffset(i) - + // l1Delay+ + delays->GetBinContent(i+1)//+ + // kV0Offset + ); +// AliInfo(Form(" fTimeOffset[%d] = %f kV0offset %f",i,fTimeOffset[i],kV0Offset)); + } + + + - TH1* h; - h = GetRawsData(kPedestalCycleInt0); - if(h) h->Reset(); - h = GetRawsData(kPedestalCycleInt1); - if(h) h->Reset(); - h = GetRawsData(kChargeEoICycleInt0); - if(h) h->Reset(); - h = GetRawsData(kChargeEoICycleInt1); - if(h) h->Reset(); + + TTimeStamp currentTime; + fCycleStartTime = currentTime.GetSec(); + + fNTotEvents = 0; +} + + +//------------------------------------------------------------------------------------------------- +Float_t AliVZEROQADataMakerRec::CorrectLeadingTime(Int_t i, Float_t time, Float_t adc) const +{ + // Correct the leading time + // for slewing effect and + // misalignment of the channels + if (time < 1e-6) return -1024; + // Channel alignment and general offset subtraction +// if (i < 32) time -= kV0CDelayCables; +// time -= fTimeOffset[i]; + //AliInfo(Form("time-offset %f", time)); + + // In case of pathological signals + if (adc < 1e-6) return time; + + // Slewing correction + Float_t thr = fCalibData->GetDiscriThr(i); + //AliInfo(Form("adc %f thr %f dtime %f ", adc,thr,fTimeSlewing->Eval(adc/thr))); + time -= fTimeSlewing->Eval(adc/thr); + + return time; } +