X-Git-Url: http://git.uio.no/git/?p=u%2Fmrichter%2FAliRoot.git;a=blobdiff_plain;f=PHOS%2FAliPHOSRawDigiProducer.cxx;h=5e540176a49052f0bd1840e0f77e8e079af441d6;hp=b8b7b851a357ce994026daf61343a8d7f73fdbcd;hb=48b634ff934842fabcb6cfedda2ada1875d97b1f;hpb=39569d3667fdee1d06b65ff53ff8741c87f5af08 diff --git a/PHOS/AliPHOSRawDigiProducer.cxx b/PHOS/AliPHOSRawDigiProducer.cxx index b8b7b851a35..5e540176a49 100644 --- a/PHOS/AliPHOSRawDigiProducer.cxx +++ b/PHOS/AliPHOSRawDigiProducer.cxx @@ -16,7 +16,7 @@ /* $Id$ */ //This class produces PHOS digits of one event -//using AliPHOSRawDecoder. +//using AliPHOSRawFitter. // // For example: // TClonesArray *digits = new TClonesArray("AliPHOSDigit",100); @@ -34,12 +34,12 @@ // --- AliRoot header files --- #include "AliPHOSRawDigiProducer.h" -#include "AliPHOSRawDecoder.h" +#include "AliPHOSRawFitterv0.h" #include "AliPHOSGeometry.h" #include "AliPHOSDigit.h" -#include "AliPHOSRecoParam.h" #include "AliPHOSCalibData.h" #include "AliPHOSPulseGenerator.h" +#include "AliCaloRawStreamV3.h" #include "AliLog.h" ClassImp(AliPHOSRawDigiProducer) @@ -47,169 +47,284 @@ ClassImp(AliPHOSRawDigiProducer) AliPHOSCalibData * AliPHOSRawDigiProducer::fgCalibData = 0 ; //-------------------------------------------------------------------------------------- -AliPHOSRawDigiProducer::AliPHOSRawDigiProducer():TObject(), - fEmcMinE(0.),fCpvMinE(0.),fSampleQualityCut(1.), - fEmcCrystals(0),fGeom(0),fPulseGenerator(0){ - -} -//-------------------------------------------------------------------------------------- -AliPHOSRawDigiProducer::AliPHOSRawDigiProducer(const AliPHOSRecoParam* parEmc, const AliPHOSRecoParam* parCpv):TObject(), - fEmcMinE(0.),fCpvMinE(0.),fSampleQualityCut(1.),fEmcCrystals(0),fGeom(0),fPulseGenerator(0){ +AliPHOSRawDigiProducer::AliPHOSRawDigiProducer(): + TObject(), + fEmcMinE(0.), + fCpvMinE(0.), + fSampleQualityCut(1.), + fSampleToSec(0.), + fEmcCrystals(0), + fGeom(0), + fPulseGenerator(0), + fRawReader(0), + fRawStream(0), + fADCValuesLG(0), + fADCValuesHG(0) +{ + // Default constructor - if(!parEmc) AliFatal("Reconstruction parameters for EMC not set!"); - if(!parCpv) AliFatal("Reconstruction parameters for CPV not set!"); + fGeom=AliPHOSGeometry::GetInstance() ; + if(!fGeom) fGeom = AliPHOSGeometry::GetInstance("IHEP"); - fEmcMinE = parEmc->GetMinE(); - fCpvMinE = parCpv->GetMinE(); + fEmcCrystals=fGeom->GetNCristalsInModule()*fGeom->GetNModules() ; + fPulseGenerator = new AliPHOSPulseGenerator(); + GetCalibrationParameters() ; - fSampleQualityCut = parEmc->GetSampleQualityCut() ; +} +//-------------------------------------------------------------------------------------- +AliPHOSRawDigiProducer::AliPHOSRawDigiProducer(AliRawReader *rawReader, + AliAltroMapping **mapping): + TObject(), + fEmcMinE(0.), + fCpvMinE(0.), + fSampleQualityCut(1.), + fSampleToSec(0.), + fEmcCrystals(0), + fGeom(0), + fPulseGenerator(0), + fRawReader(rawReader), + fRawStream(0), + fADCValuesLG(0), + fADCValuesHG(0) +{ + // Default constructor fGeom=AliPHOSGeometry::GetInstance() ; if(!fGeom) fGeom = AliPHOSGeometry::GetInstance("IHEP"); fEmcCrystals=fGeom->GetNCristalsInModule()*fGeom->GetNModules() ; - fPulseGenerator = new AliPHOSPulseGenerator(); - GetCalibrationParameters() ; + + fRawStream = new AliCaloRawStreamV3(rawReader,"PHOS",mapping); + } -//-------------------------------------------------------------------------------------- -AliPHOSRawDigiProducer::AliPHOSRawDigiProducer(const AliPHOSRawDigiProducer &dp):TObject(), - fEmcMinE(0.),fCpvMinE(0.),fSampleQualityCut(1.),fEmcCrystals(0),fGeom(0),fPulseGenerator(0){ +//-------------------------------------------------------------------------------------- +AliPHOSRawDigiProducer::AliPHOSRawDigiProducer(const AliPHOSRawDigiProducer &dp): + TObject(), + fEmcMinE(0.), + fCpvMinE(0.), + fSampleQualityCut(1.), + fSampleToSec(0.), + fEmcCrystals(0), + fGeom(0), + fPulseGenerator(0), + fRawReader(0), + fRawStream(0), + fADCValuesLG(0), + fADCValuesHG(0) + +{ + // Copy constructor fEmcMinE = dp.fEmcMinE ; fCpvMinE = dp.fCpvMinE ; + fSampleQualityCut = dp.fSampleQualityCut; + fSampleToSec = dp.fSampleToSec ; fEmcCrystals = dp.fEmcCrystals ; fPulseGenerator = new AliPHOSPulseGenerator(); fGeom = dp.fGeom ; } //-------------------------------------------------------------------------------------- -AliPHOSRawDigiProducer& AliPHOSRawDigiProducer::operator= (const AliPHOSRawDigiProducer &dp){ +AliPHOSRawDigiProducer& AliPHOSRawDigiProducer::operator= (const AliPHOSRawDigiProducer &dp) +{ + // Assign operator + if(&dp == this) return *this; fEmcMinE = dp.fEmcMinE ; fCpvMinE = dp.fCpvMinE ; fSampleQualityCut = dp.fSampleQualityCut ; + fSampleToSec = dp.fSampleToSec ; fEmcCrystals = dp.fEmcCrystals ; fGeom = dp.fGeom ; if(fPulseGenerator) delete fPulseGenerator ; fPulseGenerator = new AliPHOSPulseGenerator(); return *this; } -//-------------------------------------------------------------------------------------- -AliPHOSRawDigiProducer::~AliPHOSRawDigiProducer(){ - if(fPulseGenerator) delete fPulseGenerator ; - fPulseGenerator=0 ; +//-------------------------------------------------------------------------------------- +AliPHOSRawDigiProducer::~AliPHOSRawDigiProducer() +{ + // Destructor + if(fPulseGenerator) delete fPulseGenerator ; + fPulseGenerator=0 ; + delete fRawStream; + delete [] fADCValuesLG; + delete [] fADCValuesHG; +} +//-------------------------------------------------------------------------------------- +void AliPHOSRawDigiProducer::MakeDigits(TClonesArray *digits, AliPHOSRawFitterv0* fitter) +{ + // Create a temporary array of LG digits and then make digits from raw data + + TClonesArray *tmpLG = new TClonesArray("AliPHOSDigit",10000) ; + MakeDigits(digits, tmpLG, fitter); + tmpLG->Delete(); + delete tmpLG; } //-------------------------------------------------------------------------------------- -void AliPHOSRawDigiProducer::MakeDigits(TClonesArray *digits, AliPHOSRawDecoder* decoder) +void AliPHOSRawDigiProducer::MakeDigits(TClonesArray *digits, TClonesArray *tmpDigLG, AliPHOSRawFitterv0* fitter) { //Makes the job. - //TClonesArray *digits and raw data decoder should be provided by calling function. + //TClonesArray *digits, *tmpDigLG and raw data fitter should be provided by calling function. digits->Clear(); - Int_t iDigit = 0 ; - Int_t relId[4], absId =0; - + Int_t iDigit=0 ; + Int_t relId[4], absId=-1, caloFlag=-1; + const Double_t baseLine=1. ; //Minimal energy of digit in ADC ch. - const Double_t highLowDiff=2. ; //Maximal difference between High and Low channels in LG adc channels - //Temporary array for LowGain digits - TClonesArray tmpLG("AliPHOSDigit",10000) ; - Int_t ilgDigit=0 ; + //Calculate conversion coeff. from Sample time step to seconds + //If OCDB contains negative or zero value - use one from RCU trailer + //Negative value in OCDB is used only for simulation of raw digits + if(fgCalibData->GetSampleTimeStep()>0.) + fSampleToSec=fgCalibData->GetSampleTimeStep() ; + else + fSampleToSec=fRawStream->GetTSample() ; - while (decoder->NextDigit()) { - - Double_t energy=decoder->GetEnergy() ; - if(energy<=baseLine) //in ADC channels - continue ; - - //remove digits with bas shape. Decoder should calculate quality so that - //in default case quality [0,1], while larger values of quality mean somehow - //corrupted samples, 999 means obviously corrupted sample. - if(decoder->GetSampleQuality() > fSampleQualityCut ) - continue ; - - Bool_t lowGainFlag = decoder->IsLowGain(); - - relId[0] = decoder->GetModule(); - relId[1] = 0; - relId[2] = decoder->GetRow(); - relId[3] = decoder->GetColumn(); - fGeom->RelToAbsNumbering(relId, absId); - - Double_t time = decoder->GetTime() ; - time = CalibrateT(time,relId,lowGainFlag) ; - - energy = CalibrateE(energy,relId,lowGainFlag) ; - - if(energy <= 0.) - continue; - - if(lowGainFlag){ - new(tmpLG[ilgDigit]) AliPHOSDigit(-1,absId,(Float_t)energy,(Float_t)time); - ilgDigit++ ; - } - else{ - if(decoder->IsOverflow()) //Keep this digit to replace it by Low Gain later. - //If there is no LogGain it wil be removed by cut on Min E - new((*digits)[iDigit]) AliPHOSDigit(-1,absId,-1.f,(Float_t)time); - else - new((*digits)[iDigit]) AliPHOSDigit(-1,absId,(Float_t)energy,(Float_t)time); - iDigit++; - } - } + // Clear a temporary array for LowGain digits + tmpDigLG->Clear(); + Int_t ilgDigit=0 ; - //Now scan created LG and HG digits and keep only those which appeared in both lists - //replace energy of HighGain digits only if there is overflow - //negative energy (overflow) - digits->Sort() ; - tmpLG.Sort() ; - Int_t iLG = 0; - Int_t nLG1 = tmpLG.GetEntriesFast()-1 ; - - for(Int_t iDig=0 ; iDig < digits->GetEntriesFast() ; iDig++) { - AliPHOSDigit * digHG = dynamic_cast(digits->At(iDig)) ; - if (!digHG) continue; - AliPHOSDigit * digLG = dynamic_cast(tmpLG.At(iLG)) ; - while(iLGGetId()> digLG->GetId()){ - iLG++ ; - digLG = dynamic_cast(tmpLG.At(iLG)) ; - } - if(digLG && digHG->GetId() == digLG->GetId()){ //we found pair - if(digHG->GetEnergy()<0.){ //This is overflow in HG - digHG->SetTime(digLG->GetTime()) ; - digHG->SetEnergy(digLG->GetEnergy()) ; - } - else{ //Make approximate comparison of HG and LG energies - Double_t de = (digHG->GetEnergy()-digLG->GetEnergy())/16./0.005 ; //aproximate difference in LG ADC ch. - if(TMath::Abs(de)>highLowDiff){ //too strong difference, remove digit - digits->RemoveAt(iDig) ; - } + //Let fitter subtract pedestals in case of ZS + fitter->SetCalibData(fgCalibData) ; + + while (fRawStream->NextDDL()) { + while (fRawStream->NextChannel()) { + relId[0] = 5 - fRawStream->GetModule() ; // counts from 1 to 5 + relId[1] = 0; + relId[2] = fRawStream->GetCellX() + 1; // counts from 1 to 64 + relId[3] = fRawStream->GetCellZ() + 1; // counts from 1 to 56 + caloFlag = fRawStream->GetCaloFlag(); // 0=LG, 1=HG, 2=TRU + + if(caloFlag!=0 && caloFlag!=1) continue; //TRU data! + + fitter->SetChannelGeo(relId[0],relId[2],relId[3],caloFlag); + + if(fitter->GetAmpOffset()==0 && fitter->GetAmpThreshold()==0) { + short value = fRawStream->GetAltroCFG1(); + bool ZeroSuppressionEnabled = (value >> 15) & 0x1; + if(ZeroSuppressionEnabled) { + short offset = (value >> 10) & 0xf; + short threshold = value & 0x3ff; + fitter->SubtractPedestals(kFALSE); + fitter->SetAmpOffset(offset); + fitter->SetAmpThreshold(threshold); + } } - } - else{ //no pair - remove - // temporary fix for dead LG channels - Int_t absId=digHG->GetId() ; - Int_t relId[4] ; + + fGeom->RelToAbsNumbering(relId, absId); + + fitter->SetNBunches(0); + Int_t sigStart =0 ; + Int_t sigLength=0 ; + while (fRawStream->NextBunch()) { //Take the first in time bunch + const UShort_t *sig = fRawStream->GetSignals(); + sigStart = fRawStream->GetStartTimeBin(); + sigLength = fRawStream->GetBunchLength(); + fitter->Eval(sig,sigStart,sigLength); + if (caloFlag == AliCaloRawStreamV3::kLowGain) { + delete [] fADCValuesLG; + fADCValuesLG = new Int_t[sigLength]; + for (Int_t i=0; iGetEnergy() ; + Double_t time = fitter->GetTime() ; + if(energy<=baseLine) //in ADC channels + continue ; + + //remove digits with bad shape. Fitter should calculate quality so that + //in default case quality [0,1], while larger values of quality mean somehow + //corrupted samples, 999 means obviously corrupted sample. + //It is difficult to fit samples with overflow (even setting cut on overflow values) + //because too few points are left to fit. So we do not evaluate samples with overflow + + if(fitter->GetSignalQuality() > fSampleQualityCut && !(fitter->IsOverflow())) + continue ; + + energy = CalibrateE(energy,relId,!caloFlag) ; + + //convert time from sample bin units to s + time*=fSampleToSec ; +//CalibrateT moved to Clusterizer +// time = CalibrateT(time,relId,!caloFlag) ; + // subtract RCU L1 phase (L1Phase is in seconds) w.r.t. L0: + time -= fRawStream->GetL1Phase(); + + + + if(energy <= 0.) + continue; + + if (caloFlag == AliCaloRawStreamV3::kLowGain) { + new((*tmpDigLG)[ilgDigit]) AliPHOSDigit(-1,absId,(Float_t)energy,(Float_t)time); + if (sigLength>0 && fADCValuesLG!=0) + static_cast(tmpDigLG->At(ilgDigit))->SetALTROSamplesLG(sigLength,fADCValuesLG); + ilgDigit++ ; + } + else if (caloFlag == AliCaloRawStreamV3::kHighGain) { + if(fitter->IsOverflow()) //Keep this digit to replace it by Low Gain later. + //If there is no LogGain it wil be removed by cut on Min E + new((*digits)[iDigit]) AliPHOSDigit(-1,absId,-1.f,(Float_t)time); + else + new((*digits)[iDigit]) AliPHOSDigit(-1,absId,(Float_t)energy,(Float_t)time); + if (sigLength>0 && fADCValuesHG!=0) + static_cast(digits->At(iDigit))->SetALTROSamplesHG(sigLength,fADCValuesHG); + iDigit++; + } + } // End of NextChannel() + + //Now scan created LG and HG digits and keep only those which appeared in both lists + //replace energy of HighGain digits only if there is overflow + //negative energy (overflow) + digits->Sort() ; + tmpDigLG->Sort() ; + Int_t iLG = 0; + Int_t nLG1 = tmpDigLG->GetEntriesFast()-1 ; + + for(Int_t iDig=0 ; iDig < digits->GetEntriesFast() ; iDig++) { + AliPHOSDigit * digHG = dynamic_cast(digits->At(iDig)) ; + if (!digHG) continue; + AliPHOSDigit * digLG = dynamic_cast(tmpDigLG->At(iLG)) ; + while(digLG && iLGGetId()> digLG->GetId()){ + iLG++ ; + digLG = dynamic_cast(tmpDigLG->At(iLG)) ; + } + absId=digHG->GetId() ; fGeom->AbsToRelNumbering(absId,relId) ; - if(relId[2]%2==1 && relId[3]%16==4) - continue ; - if(digHG->GetEnergy()>16*5*0.005) //LG too low to exist - digits->RemoveAt(iDig) ; + + if(digLG && digHG->GetId() == digLG->GetId()){ //we found pair + if(digHG->GetEnergy()<0.){ //This is overflow in HG + digHG->SetTime(digLG->GetTime()) ; + digHG->SetEnergy(digLG->GetEnergy()) ; + } + } + else{ //no pair - remove + if(digHG->GetEnergy()<0.) //no pair, in saturation + digits->RemoveAt(iDig) ; + } } - } + } // End of NextDDL() CleanDigits(digits) ; - + } //____________________________________________________________________________ Double_t AliPHOSRawDigiProducer::CalibrateE(Double_t amp, Int_t* relId, Bool_t isLowGain) { - // Convert EMC measured amplitude into real energy. - // Calibration parameters are taken from calibration data base for raw data, - // or from digitizer parameters for simulated data. + // Convert EMC LG amplitude to HG (multipli by ~16) + // Calibration parameters are taken from calibration data base if(fgCalibData){ Int_t module = relId[0]; Int_t column = relId[3]; @@ -218,7 +333,6 @@ Double_t AliPHOSRawDigiProducer::CalibrateE(Double_t amp, Int_t* relId, Bool_t i if(isLowGain){ amp*= fgCalibData->GetHighLowRatioEmc(module,column,row); } - amp *= fgCalibData->GetADCchannelEmc(module,column,row); return amp ; } } @@ -228,7 +342,6 @@ Double_t AliPHOSRawDigiProducer::CalibrateE(Double_t amp, Int_t* relId, Bool_t i Double_t AliPHOSRawDigiProducer::CalibrateT(Double_t time, Int_t * relId, Bool_t /* isLowGain */) { //Calibrate time - time*=fPulseGenerator->GetRawFormatTimeTrigger() ; if(fgCalibData){ Int_t module = relId[0]; Int_t column = relId[3]; @@ -266,7 +379,7 @@ void AliPHOSRawDigiProducer::CleanDigits(TClonesArray * digits) if(isBadMap){ //check bad map now Int_t relid[4] ; fGeom->AbsToRelNumbering(digit->GetId(), relid) ; - if(fgCalibData->IsBadChannelEmc(relid[0],relid[2],relid[3])){ + if(fgCalibData->IsBadChannelEmc(relid[0],relid[3],relid[2])){ digits->RemoveAt(i) ; } }