X-Git-Url: http://git.uio.no/git/?p=u%2Fmrichter%2FAliRoot.git;a=blobdiff_plain;f=VZERO%2FAliVZEROReconstructor.cxx;h=412dac43b905abcb9498674673a64f0f45a4f849;hp=cace640eb51ffabb757a451ec363ffa043e05f6a;hb=a4d010b146a124fb5fd0b520b2eeca4ca47d5476;hpb=7bf5b178fad91d23c3e52728cd6dca9dbedfd626 diff --git a/VZERO/AliVZEROReconstructor.cxx b/VZERO/AliVZEROReconstructor.cxx index cace640eb51..412dac43b90 100644 --- a/VZERO/AliVZEROReconstructor.cxx +++ b/VZERO/AliVZEROReconstructor.cxx @@ -52,8 +52,10 @@ AliVZEROReconstructor:: AliVZEROReconstructor(): AliReconstructor(), fESD(0x0), fESDVZEROfriend(0x0), fCalibData(NULL), + fTriggerData(NULL), fTimeSlewing(NULL), fSaturationCorr(NULL), + fEqFactors(NULL), fCollisionMode(0), fBeamEnergy(0.), fDigitsArray(0) @@ -99,6 +101,14 @@ AliVZEROReconstructor:: AliVZEROReconstructor(): AliReconstructor(), AliCDBEntry *entry5 = AliCDBManager::Instance()->Get("VZERO/Calib/Saturation"); if (!entry5) AliFatal("Saturation entry is not found in OCDB !"); fSaturationCorr = (TObjArray*)entry5->GetObject(); + + AliCDBEntry *entry6 = AliCDBManager::Instance()->Get("VZERO/Trigger/Data"); + if (!entry6) AliFatal("VZERO trigger config data is not found in OCDB !"); + fTriggerData = (AliVZEROTriggerData*)entry6->GetObject(); + + AliCDBEntry *entry7 = AliCDBManager::Instance()->Get("VZERO/Calib/EqualizationFactors"); + if (!entry7) AliFatal("VZERO equalization factors are not found in OCDB !"); + fEqFactors = (TH1F*)entry7->GetObject(); } @@ -206,6 +216,7 @@ void AliVZEROReconstructor::ConvertDigits(AliRawReader* rawReader, TTree* digits } // Filling the global part of esd friend object that is available only for raw data + rawStream.FillTriggerBits(fTriggerData); fESDVZEROfriend->SetTriggerInputs(rawStream.GetTriggerInputs()); fESDVZEROfriend->SetTriggerInputsMask(rawStream.GetTriggerInputsMask()); @@ -221,6 +232,12 @@ void AliVZEROReconstructor::ConvertDigits(AliRawReader* rawReader, TTree* digits digitsTree->GetUserInfo()->Add(new TParameter("BGflagsV0A",aBGflagsV0A)); digitsTree->GetUserInfo()->Add(new TParameter("BGflagsV0C",aBGflagsV0C)); + UShort_t chargeA,chargeC; + rawStream.CalculateChargeForCentrTriggers(fTriggerData,chargeA,chargeC); + digitsTree->GetUserInfo()->Add(new TParameter("ChargeA",(Int_t)chargeA)); + digitsTree->GetUserInfo()->Add(new TParameter("ChargeC",(Int_t)chargeC)); + digitsTree->GetUserInfo()->Add(new TParameter("TriggerInputs",(Int_t)rawStream.GetTriggerInputs())); + digitsTree->Fill(); } @@ -265,27 +282,35 @@ void AliVZEROReconstructor::FillESD(TTree* digitsTree, TTree* /*clustersTree*/, if (digitsTree->GetUserInfo()->FindObject("BBflagsV0A")) { aBBflagsV0A = ((TParameter*)digitsTree->GetUserInfo()->FindObject("BBflagsV0A"))->GetVal(); } - else - AliWarning("V0A beam-beam flags not found in digits tree UserInfo! The flags will not be written to the raw-data stream!"); + else { + if (esd && (esd->GetEventType() == 7)) + AliWarning("V0A beam-beam flags not found in digits tree UserInfo!"); + } if (digitsTree->GetUserInfo()->FindObject("BBflagsV0C")) { aBBflagsV0C = ((TParameter*)digitsTree->GetUserInfo()->FindObject("BBflagsV0C"))->GetVal(); } - else - AliWarning("V0C beam-beam flags not found in digits tree UserInfo! The flags will not be written to the raw-data stream!"); + else { + if (esd && (esd->GetEventType() == 7)) + AliWarning("V0C beam-beam flags not found in digits tree UserInfo!"); + } if (digitsTree->GetUserInfo()->FindObject("BGflagsV0A")) { aBGflagsV0A = ((TParameter*)digitsTree->GetUserInfo()->FindObject("BGflagsV0A"))->GetVal(); } - else - AliWarning("V0A beam-gas flags not found in digits tree UserInfo! The flags will not be written to the raw-data stream!"); + else { + if (esd && (esd->GetEventType() == 7)) + AliWarning("V0A beam-gas flags not found in digits tree UserInfo!"); + } if (digitsTree->GetUserInfo()->FindObject("BGflagsV0C")) { aBGflagsV0C = ((TParameter*)digitsTree->GetUserInfo()->FindObject("BGflagsV0C"))->GetVal(); } - else - AliWarning("V0C beam-gas flags not found in digits tree UserInfo! The flags will not be written to the raw-data stream!"); - + else { + if (esd && (esd->GetEventType() == 7)) + AliWarning("V0C beam-gas flags not found in digits tree UserInfo!"); + } + // Beam-beam and beam-gas flags (hardware) for (Int_t iChannel = 0; iChannel < 64; ++iChannel) { if(iChannel < 32) { @@ -298,6 +323,39 @@ void AliVZEROReconstructor::FillESD(TTree* digitsTree, TTree* /*clustersTree*/, } } + // Fill the trigger charges and bits + UShort_t chargeA = 0; + UShort_t chargeC = 0; + UShort_t triggerInputs = 0; + if (digitsTree->GetUserInfo()->FindObject("ChargeA")) { + chargeA = (UShort_t)(((TParameter*)digitsTree->GetUserInfo()->FindObject("ChargeA"))->GetVal()); + } + else { + if (esd && (esd->GetEventType() == 7)) + AliWarning("V0A trigger charge not found in digits tree UserInfo!"); + } + + if (digitsTree->GetUserInfo()->FindObject("ChargeC")) { + chargeC = (UShort_t)(((TParameter*)digitsTree->GetUserInfo()->FindObject("ChargeC"))->GetVal()); + } + else { + if (esd && (esd->GetEventType() == 7)) + AliWarning("V0C trigger charge not found in digits tree UserInfo!"); + } + + if (digitsTree->GetUserInfo()->FindObject("TriggerInputs")) { + triggerInputs = (UShort_t)(((TParameter*)digitsTree->GetUserInfo()->FindObject("TriggerInputs"))->GetVal()); + } + else { + if (esd && (esd->GetEventType() == 7)) + AliWarning("V0C trigger charge not found in digits tree UserInfo!"); + } + + fESDVZERO->SetTriggerChargeA(chargeA); + fESDVZERO->SetTriggerChargeC(chargeC); + fESDVZERO->SetTriggerBits(triggerInputs); + fESDVZERO->SetBit(AliESDVZERO::kTriggerChargeBitsFilled,kTRUE); + Int_t nEntries = (Int_t)digitsTree->GetEntries(); for (Int_t e=0; eGetEvent(e); @@ -345,11 +403,16 @@ void AliVZEROReconstructor::FillESD(TTree* digitsTree, TTree* /*clustersTree*/, width[pmNumber] = digit->Width(); if (adc[pmNumber] > 0) { - AliDebug(1,Form("PM = %d ADC = %f TDC %f (%f) Int %d (%d %d %d %d %d) %f %f %f %f %d %d",pmNumber, adc[pmNumber], + AliDebug(1,Form("PM = %d ADC = %.2f (%.2f) TDC %.2f (%.2f) Int %d (%d %d %d %d %d %d %d %d %d %d %d %d %d %d %d %d %d %d %d %d %d) %.2f %.2f %.2f %.2f %d %d",pmNumber, adc[pmNumber], + digit->ChargeADC(11)+digit->ChargeADC(10)+digit->ChargeADC(9)+digit->ChargeADC(8)+ + digit->ChargeADC(7)+digit->ChargeADC(6)+digit->ChargeADC(5)+digit->ChargeADC(4)- + 4.*fCalibData->GetPedestal(pmNumber)-4.*fCalibData->GetPedestal(pmNumber+64), digit->Time(),time[pmNumber], integrator, + digit->ChargeADC(0),digit->ChargeADC(1),digit->ChargeADC(2),digit->ChargeADC(3),digit->ChargeADC(4),digit->ChargeADC(5),digit->ChargeADC(6),digit->ChargeADC(7), digit->ChargeADC(8),digit->ChargeADC(9),digit->ChargeADC(10), digit->ChargeADC(11),digit->ChargeADC(12), + digit->ChargeADC(13),digit->ChargeADC(14),digit->ChargeADC(15),digit->ChargeADC(16),digit->ChargeADC(17),digit->ChargeADC(18),digit->ChargeADC(19),digit->ChargeADC(20), fCalibData->GetPedestal(pmNumber),fCalibData->GetSigma(pmNumber), fCalibData->GetPedestal(pmNumber+64),fCalibData->GetSigma(pmNumber+64), aBBflag[pmNumber],aBGflag[pmNumber])); @@ -391,6 +454,20 @@ void AliVZEROReconstructor::FillESD(TTree* digitsTree, TTree* /*clustersTree*/, if (esd) { AliDebug(1, Form("Writing VZERO data to ESD tree")); esd->SetVZEROData(fESDVZERO); + const AliESDRun *esdRun = esd->GetESDRun(); + if (esdRun) { + Float_t factors[64]; + Float_t factorSum = 0; + for(Int_t i = 0; i < 64; ++i) { + factors[i] = fEqFactors->GetBinContent(i+1)*fCalibData->GetMIPperADC(i); + factorSum += factors[i]; + } + for(Int_t i = 0; i < 64; ++i) factors[i] *= (64./factorSum); + + esd->SetVZEROEqFactors(factors); + } + else + AliError("AliESDRun object is not available! Cannot write the equalization factors!"); } if (esd) {