X-Git-Url: http://git.uio.no/git/?a=blobdiff_plain;f=EMCAL%2FAliEMCALRawUtils.cxx;h=3b70379d44ddc850c7b284c75799f9b3116517b9;hb=452656d15558dace1996058a954ab3af884d3482;hp=d19470f5d997bfe5aceff992691f30ec061a0a9b;hpb=5a056daa2c64888e2134279ab3b2257ac4593474;p=u%2Fmrichter%2FAliRoot.git diff --git a/EMCAL/AliEMCALRawUtils.cxx b/EMCAL/AliEMCALRawUtils.cxx index d19470f5d99..3b70379d44d 100644 --- a/EMCAL/AliEMCALRawUtils.cxx +++ b/EMCAL/AliEMCALRawUtils.cxx @@ -1,3 +1,4 @@ +// -*- mode: c++ -*- /************************************************************************** * Copyright(c) 1998-1999, ALICE Experiment at CERN, All rights reserved. * * * @@ -14,64 +15,110 @@ **************************************************************************/ /* $Id$ */ -/* History of cvs commits: - * - * $Log$ - * Revision 1.2 2007/09/03 20:55:35 jklay - * EMCAL e-by-e reconstruction methods from Cvetan - * - * Revision 1.1 2007/03/17 19:56:38 mvl - * Moved signal shape routines from AliEMCAL to separate class AliEMCALRawUtils to streamline raw data reconstruction code. - * */ -//*-- Author: Marco van Leeuwen (LBL) -#include "AliEMCALRawUtils.h" -#include "TF1.h" -#include "TGraph.h" -#include "TSystem.h" +//_________________________________________________________________________ +// Utility Class for handling Raw data +// Does all transitions from Digits to Raw and vice versa, +// for simu and reconstruction +// +// Note: the current version is still simplified. Only +// one raw signal per digit is generated; either high-gain or low-gain +// Need to add concurrent high and low-gain info in the future +// No pedestal is added to the raw signal. +//*-- Author: Marco van Leeuwen (LBL) +//*-- Major refactoring by Per Thomas Hille -#include "AliLog.h" +//#include "AliCDBManager.h" +#include "AliEMCALRawUtils.h" +#include "AliRun.h" #include "AliRunLoader.h" -#include "AliCaloAltroMapping.h" #include "AliAltroBuffer.h" #include "AliRawReader.h" -#include "AliCaloRawStream.h" +#include "AliCaloRawStreamV3.h" #include "AliDAQ.h" - +#include "AliEMCALRecParam.h" #include "AliEMCALLoader.h" #include "AliEMCALGeometry.h" -#include "AliEMCALDigitizer.h" #include "AliEMCALDigit.h" - - +#include "AliEMCALRawDigit.h" +#include "AliEMCAL.h" +#include "AliCaloCalibPedestal.h" +#include "AliCaloBunchInfo.h" +#include "AliCaloFitResults.h" +#include "AliEMCALTriggerRawDigitMaker.h" +#include "AliEMCALTriggerSTURawStream.h" +#include "AliEMCALTriggerData.h" +#include "AliCaloConstants.h" +#include "AliCaloRawAnalyzer.h" +#include "AliCaloRawAnalyzerFactory.h" +#include "AliEMCALRawResponse.h" + +using namespace CALO; +using namespace EMCAL; + +using std::vector; ClassImp(AliEMCALRawUtils) -// Signal shape parameters -Int_t AliEMCALRawUtils::fgOrder = 2 ; // Order of gamma function -Double_t AliEMCALRawUtils::fgTimeMax = 2.56E-5 ; // each sample is over 100 ns fTimeMax/fTimeBins -Double_t AliEMCALRawUtils::fgTau = 165E-9 ; // 165 ns (from testbeam; not very accurate) -Double_t AliEMCALRawUtils::fgTimeTrigger = 1.5E-6 ; // 15 time bins ~ 1.5 musec - -// some digitization constants -Int_t AliEMCALRawUtils::fgThreshold = 1; -Int_t AliEMCALRawUtils::fgDDLPerSuperModule = 2; // 2 ddls per SuperModule -AliEMCALRawUtils::AliEMCALRawUtils(): fHighLowGainFactor(0.) { - fHighLowGainFactor = 16. ; // adjusted for a low gain range of 82 GeV (10 bits) +AliEMCALRawUtils::AliEMCALRawUtils( Algo::fitAlgorithm fitAlgo) : fNoiseThreshold(3), + fNPedSamples(4), + fGeom(0), + fOption(""), + fRemoveBadChannels(kFALSE), + fFittingAlgorithm(fitAlgo), + fTimeMin(-1.), + fTimeMax(1.), + fUseFALTRO(kTRUE), + fRawAnalyzer(0), + fTriggerRawDigitMaker(0x0) +{ // ctor; set up fit algo etc + SetFittingAlgorithm(fitAlgo); + const TObjArray* maps = AliEMCALRecParam::GetMappings(); + if(!maps) AliFatal("Cannot retrieve ALTRO mappings!!"); + for(Int_t i = 0; i < 4; i++) + { + fMapping[i] = (AliAltroMapping*)maps->At(i); + } + + AliRunLoader *rl = AliRunLoader::Instance(); + if (rl && rl->GetAliRun()) + { + AliEMCAL * emcal = dynamic_cast(rl->GetAliRun()->GetDetector("EMCAL")); + if(emcal) + { + fGeom = emcal->GetGeometry(); + } + else + { + AliDebug(1, Form("Using default geometry in raw reco")); + fGeom = AliEMCALGeometry::GetInstance(AliEMCALGeometry::GetDefaultGeometryName()); + } + } + else + { + AliDebug(1, Form("Using default geometry in raw reco")); + fGeom = AliEMCALGeometry::GetInstance(AliEMCALGeometry::GetDefaultGeometryName()); + } + + if(!fGeom) AliFatal(Form("Could not get geometry!")); + fTriggerRawDigitMaker = new AliEMCALTriggerRawDigitMaker(); } -//____________________________________________________________________________ -AliEMCALRawUtils::~AliEMCALRawUtils() { + + +AliEMCALRawUtils::~AliEMCALRawUtils() +{ + //dtor + delete fRawAnalyzer; + delete fTriggerRawDigitMaker; } -//____________________________________________________________________________ + + void AliEMCALRawUtils::Digits2Raw() { // convert digits of the current event to raw data - - AliRunLoader *rl = AliRunLoader::GetRunLoader(); + AliRunLoader *rl = AliRunLoader::Instance(); AliEMCALLoader *loader = dynamic_cast(rl->GetDetectorLoader("EMCAL")); - - // get the digits loader->LoadDigits("EMCAL"); loader->GetEvent(); TClonesArray* digits = loader->Digits() ; @@ -80,86 +127,85 @@ void AliEMCALRawUtils::Digits2Raw() Warning("Digits2Raw", "no digits found !"); return; } - - // get the geometry - AliEMCALGeometry* geom = AliEMCALGeometry::GetInstance(); - if (!geom) { - AliError(Form("No geometry found !")); - return; - } - static const Int_t nDDL = 12*2; // 12 SM hardcoded for now. Buffers allocated dynamically, when needed, so just need an upper limit here + static const Int_t nDDL = 20*2; // 20 SM for EMCal + DCal hardcoded for now. Buffers allocated dynamically, when needed, so just need an upper limit here AliAltroBuffer* buffers[nDDL]; for (Int_t i=0; i < nDDL; i++) buffers[i] = 0; - - Int_t adcValuesLow[fgkTimeBins]; - Int_t adcValuesHigh[fgkTimeBins]; - - //Load Mapping RCU files once - TString path = gSystem->Getenv("ALICE_ROOT"); - path += "/EMCAL/mapping/RCU"; - TString path0 = path+"0.data";//This file will change in future - TString path1 = path+"1.data";//This file will change in future - AliAltroMapping * mapping[2] ; // For the moment only 2 - mapping[0] = new AliCaloAltroMapping(path0.Data()); - mapping[1] = new AliCaloAltroMapping(path1.Data()); - + + TArrayI adcValuesLow( TIMEBINS ); + TArrayI adcValuesHigh( TIMEBINS ); + // loop over digits (assume ordered digits) for (Int_t iDigit = 0; iDigit < digits->GetEntries(); iDigit++) { AliEMCALDigit* digit = dynamic_cast(digits->At(iDigit)) ; - if (digit->GetAmp() < fgThreshold) - continue; - - //get cell indices - Int_t nSM = 0; - Int_t nIphi = 0; - Int_t nIeta = 0; - Int_t iphi = 0; - Int_t ieta = 0; - Int_t nModule = 0; - geom->GetCellIndex(digit->GetId(), nSM, nModule, nIphi, nIeta); - geom->GetCellPhiEtaIndexInSModule(nSM, nModule, nIphi, nIeta,iphi, ieta) ; - - //Check which is the RCU of the cell. - Int_t iRCU = -111; - //RCU0 - if (0<=iphi&&iphi<8) iRCU=0; // first cable row - else if (8<=iphi&&iphi<16 && 0<=ieta&&ieta<24) iRCU=0; // first half; - //second cable row - //RCU1 - else if(8<=iphi&&iphi<16 && 24<=ieta&&ieta<48) iRCU=1; // second half; - //second cable row - else if(16<=iphi&&iphi<24) iRCU=1; // third cable row + if(!digit) { + AliFatal("NULL Digit"); + } else { + if (digit->GetAmplitude() < AliEMCALRawResponse::GetRawFormatThreshold() ) { + continue; + } + //get cell indices + Int_t nSM = 0; + Int_t nIphi = 0; + Int_t nIeta = 0; + Int_t iphi = 0; + Int_t ieta = 0; + Int_t nModule = 0; + fGeom->GetCellIndex(digit->GetId(), nSM, nModule, nIphi, nIeta); + fGeom->GetCellPhiEtaIndexInSModule(nSM, nModule, nIphi, nIeta,iphi, ieta) ; - //Which DDL? - Int_t iDDL = fgDDLPerSuperModule* nSM + iRCU; - if (iDDL >= nDDL) - Fatal("Digits2Raw()","Non-existent DDL board number: %d", iDDL); - - if (buffers[iDDL] == 0) { - // open new file and write dummy header - TString fileName = AliDAQ::DdlFileName("EMCAL",iDDL); - buffers[iDDL] = new AliAltroBuffer(fileName.Data(),mapping[iRCU]); - buffers[iDDL]->WriteDataHeader(kTRUE, kFALSE); //Dummy; - } + //Check which is the RCU, 0 or 1, of the cell. + Int_t iRCU = -111; + if (0<=iphi&&iphi<8) iRCU=0; // first cable row + else if (8<=iphi&&iphi<16 && 0<=ieta&&ieta<24) iRCU=0; // first half; + else if(8<=iphi&&iphi<16 && 24<=ieta&&ieta<48) iRCU=1; // second half; + //second cable row + else if(16<=iphi&&iphi<24) iRCU=1; // third cable row + + if (nSM%2==1) iRCU = 1 - iRCU; // swap for odd=C side, to allow us to cable both sides the same + + if (iRCU<0) + Fatal("Digits2Raw()","Non-existent RCU number: %d", iRCU); - // out of time range signal (?) - if (digit->GetTimeR() > GetRawFormatTimeMax() ) { - AliInfo("Signal is out of time range.\n"); - buffers[iDDL]->FillBuffer((Int_t)digit->GetAmp()); - buffers[iDDL]->FillBuffer(GetRawFormatTimeBins() ); // time bin - buffers[iDDL]->FillBuffer(3); // bunch length - buffers[iDDL]->WriteTrailer(3, ieta, iphi, nSM); // trailer - // calculate the time response function - } else { - Bool_t lowgain = RawSampledResponse(digit->GetTimeR(), digit->GetAmp(), adcValuesHigh, adcValuesLow) ; - if (lowgain) - buffers[iDDL]->WriteChannel(ieta, iphi, 0, GetRawFormatTimeBins(), adcValuesLow, fgThreshold); - else - buffers[iDDL]->WriteChannel(ieta,iphi, 1, GetRawFormatTimeBins(), adcValuesHigh, fgThreshold); - } - } + //Which DDL? + Int_t iDDL = NRCUSPERMODULE*nSM + iRCU; + if (iDDL < 0 || iDDL >= nDDL){ + Fatal("Digits2Raw()","Non-existent DDL board number: %d", iDDL); + } else { + if (buffers[iDDL] == 0) { + // open new file and write dummy header + TString fileName = AliDAQ::DdlFileName("EMCAL",iDDL); + //Select mapping file RCU0A, RCU0C, RCU1A, RCU1C + Int_t iRCUside=iRCU+(nSM%2)*2; + //iRCU=0 and even (0) SM -> RCU0A.data 0 + //iRCU=1 and even (0) SM -> RCU1A.data 1 + //iRCU=0 and odd (1) SM -> RCU0C.data 2 + //iRCU=1 and odd (1) SM -> RCU1C.data 3 + buffers[iDDL] = new AliAltroBuffer(fileName.Data(),fMapping[iRCUside]); + buffers[iDDL]->WriteDataHeader(kTRUE, kFALSE); //Dummy; + } + + // out of time range signal (?) + if (digit->GetTimeR() > TIMEBINMAX ) { + AliInfo("Signal is out of time range.\n"); + buffers[iDDL]->FillBuffer((Int_t)digit->GetAmplitude()); + buffers[iDDL]->FillBuffer( TIMEBINS ); // time bin + buffers[iDDL]->FillBuffer(3); // bunch length + buffers[iDDL]->WriteTrailer(3, ieta, iphi, nSM); // trailer + // calculate the time response function + } else { + Bool_t lowgain = AliEMCALRawResponse::RawSampledResponse(digit->GetTimeR(), digit->GetAmplitude(), + adcValuesHigh.GetArray(), adcValuesLow.GetArray()) ; + + if (lowgain) + buffers[iDDL]->WriteChannel(ieta, iphi, 0, TIMEBINS, adcValuesLow.GetArray(), AliEMCALRawResponse::GetRawFormatThreshold() ); + else + buffers[iDDL]->WriteChannel(ieta,iphi, 1, TIMEBINS, adcValuesHigh.GetArray(), AliEMCALRawResponse::GetRawFormatThreshold() ); + } + }// iDDL under the limits + }//digit exists + }//Digit loop // write headers and close files for (Int_t i=0; i < nDDL; i++) { @@ -169,206 +215,171 @@ void AliEMCALRawUtils::Digits2Raw() delete buffers[i]; } } - mapping[0]->Delete(); - mapping[1]->Delete(); + loader->UnloadDigits(); } -//____________________________________________________________________________ -void AliEMCALRawUtils::Raw2Digits(AliRawReader* reader,TClonesArray *digitsArr) -{ - // convert raw data of the current event to digits - AliEMCALGeometry * geom = AliEMCALGeometry::GetInstance(); - if (!geom) { - AliError(Form("No geometry found !")); - return; - } - digitsArr->Clear(); - if (!digitsArr) { - Error("Raw2Digits", "no digits found !"); - return; - } - if (!reader) { - Error("Raw2Digits", "no raw reader found !"); - return; - } - - // Use AliAltroRawStream to read the ALTRO format. No need to - // reinvent the wheel :-) - AliCaloRawStream in(reader,"EMCAL"); - // Select EMCAL DDL's; - reader->Select("EMCAL"); - - // reading is from previously existing AliEMCALGetter.cxx - // ReadRaw method - TF1 * signalF = new TF1("signal", RawResponseFunction, 0, GetRawFormatTimeMax(), 4); - signalF->SetParNames("Charge", "Gain", "Amplitude", "TimeZero"); +void AliEMCALRawUtils::AddDigit(TClonesArray *digitsArr, Int_t id, Int_t lowGain, Float_t amp, Float_t time, Float_t chi2, Int_t ndf) +{ + // comment + AliEMCALDigit *digit = 0, *tmpdigit = 0; + TIter nextdigit(digitsArr); + + while (digit == 0 && (tmpdigit = (AliEMCALDigit*) nextdigit())) + { + if (tmpdigit->GetId() == id) digit = tmpdigit; + } - Int_t id = -1; - Int_t idigit = 0 ; - Double_t time = 0. ; - Double_t amp = 0. ; - - TGraph * gSig = new TGraph(GetRawFormatTimeBins()) ; - - Int_t eofReached = 0; - Int_t lowGain = 0; - - in.Next(); // Go to first digit - do { - id = geom->GetAbsCellIdFromCellIndexes(in.GetModule(), in.GetRow(), in.GetColumn()) ; - lowGain = in.IsLowGain(); - gSig->SetPoint(in.GetTime(), - in.GetTime()* GetRawFormatTimeMax() / GetRawFormatTimeBins(), - in.GetSignal()) ; - - Int_t iTime = 1; - do { - if (!in.Next()) - eofReached = 1; - else { - gSig->SetPoint(in.GetTime(), - in.GetTime()* GetRawFormatTimeMax() / GetRawFormatTimeBins(), - in.GetSignal()) ; - } - iTime++; - } while (!eofReached && !in.IsNewRow() && !in.IsNewColumn() && !in.IsNewModule()); - - FitRaw(gSig, signalF, amp, time) ; + if (!digit) { // no digit existed for this tower; create one + Int_t type = AliEMCALDigit::kHG; // use enum in AliEMCALDigit if (lowGain) - amp *= fHighLowGainFactor; + { + amp *= HGLGFACTOR; + type = AliEMCALDigit::kLGnoHG; + } - if (amp > 0) { - AliDebug(2,Form("id %d amp %g", id, amp)); - new((*digitsArr)[idigit]) AliEMCALDigit( -1, -1, id, (Int_t)amp, time, idigit) ; - idigit++ ; - } - Int_t index ; + Int_t idigit = digitsArr->GetEntries(); + new((*digitsArr)[idigit]) AliEMCALDigit( -1, -1, id, amp, time, type, idigit, chi2, ndf); + AliDebug(2,Form("Add digit Id %d for the first time, type %d", id, type)); + }//digit added first time + else + { // a digit already exists, check range + // (use high gain if signal < cut value, otherwise low gain) + if (lowGain) + { // new digit is low gain + if (digit->GetAmplitude() > OVERFLOWCUT ) + { // use if previously stored (HG) digit is out of range + digit->SetAmplitude( HGLGFACTOR * amp); + digit->SetTime(time); + digit->SetType(AliEMCALDigit::kLG); + AliDebug(2,Form("Add LG digit ID %d for the second time, type %d", digit->GetId(), digit->GetType())); + } + }//new low gain digit + else { // new digit is high gain - // Reset graph - for (index = 0; index < GetRawFormatTimeBins(); index++) { - gSig->SetPoint(index, index * GetRawFormatTimeMax() / GetRawFormatTimeBins(), 0) ; - } - } while (!eofReached); // EMCAL entries loop - - delete signalF ; - delete gSig; - - return ; + if (amp < OVERFLOWCUT ) + { // new digit is high gain; use if not out of range + digit->SetAmplitude(amp); + digit->SetTime(time); + digit->SetType(AliEMCALDigit::kHG); + AliDebug(2,Form("Add HG digit ID %d for the second time, type %d", digit->GetId(), digit->GetType())); + } + else + { // HG out of range, just change flag value to show that HG did exist + digit->SetType(AliEMCALDigit::kLG); + AliDebug(2,Form("Change LG digit to HG, ID %d, type %d", digit->GetId(), digit->GetType())); + } + }//new high gain digit + }//digit existed replace it } -//____________________________________________________________________________ -void AliEMCALRawUtils::FitRaw(TGraph * gSig, TF1* signalF, Double_t & amp, Double_t & time) -{ - // Fits the raw signal time distribution; from AliEMCALGetter - - const Int_t kNoiseThreshold = 0 ; - Double_t timezero1 = 0., timezero2 = 0., timemax = 0. ; - Double_t signal = 0., signalmax = 0. ; - amp = time = 0. ; - timezero1 = signalmax = timemax = 0. ; - timezero1 = GetRawFormatTimeMax(); - timezero2 = 0; +void AliEMCALRawUtils::Raw2Digits(AliRawReader* reader,TClonesArray *digitsArr, const AliCaloCalibPedestal* pedbadmap, TClonesArray *digitsTRG, AliEMCALTriggerData* trgData) +{ + //conversion of raw data to digits + if(digitsArr) digitsArr->Clear("C"); + if (!digitsArr) { Error("Raw2Digits", "no digits found !");return;} + if (!reader) {Error("Raw2Digits", "no raw reader found !");return;} + AliEMCALTriggerSTURawStream inSTU(reader); + AliCaloRawStreamV3 in(reader,"EMCAL",fMapping); + reader->Select("EMCAL",0,39); // 39 = AliEMCALGeoParams::fgkLastAltroDDL + fTriggerRawDigitMaker->Reset(); + fTriggerRawDigitMaker->SetIO(reader, in, inSTU, digitsTRG, trgData); + fRawAnalyzer->SetIsZeroSuppressed(true); // TMP - should use stream->IsZeroSuppressed(), or altro cfg registers later + + Int_t lowGain = 0; + Int_t caloFlag = 0; // low, high gain, or TRU, or LED ref. + + Float_t bcTimePhaseCorr = 0; // for BC-based L1 phase correction + Int_t bcMod4 = (reader->GetBCID() % 4); // LHC uses 40 MHz, EMCal uses 10 MHz clock + + //AliCDBManager* man = AliCDBManager::Instance(); + //Int_t runNumber = man->GetRun(); + + Int_t runNumber = reader->GetRunNumber(); + + if ((runNumber >130850 ) && (bcMod4==0 || bcMod4==1)) + bcTimePhaseCorr = -1e-7; // subtract 100 ns for certain BC values + + while (in.NextDDL()) + { + while (in.NextChannel()) + { + caloFlag = in.GetCaloFlag(); + if (caloFlag > 2) continue; // Work with ALTRO and FALTRO + if(caloFlag < 2 && fRemoveBadChannels && pedbadmap->IsBadChannel(in.GetModule(),in.GetColumn(),in.GetRow())) + { + continue; + } + vector bunchlist; + while (in.NextBunch()) + { + bunchlist.push_back( AliCaloBunchInfo(in.GetStartTimeBin(), in.GetBunchLength(), in.GetSignals() ) ); + } + if (bunchlist.size() == 0) continue; + if ( caloFlag < 2 ) + { // ALTRO + Int_t id = fGeom->GetAbsCellIdFromCellIndexes(in.GetModule(), in.GetRow(), in.GetColumn()) ; + lowGain = in.IsLowGain(); + fRawAnalyzer->SetL1Phase( in.GetL1Phase() ); + AliCaloFitResults res = fRawAnalyzer->Evaluate( bunchlist, in.GetAltroCFG1(), in.GetAltroCFG2()); + if(res.GetAmp() >= fNoiseThreshold ) + { + AddDigit(digitsArr, id, lowGain, res.GetAmp(), res.GetTime()+bcTimePhaseCorr, res.GetChi2(), res.GetNdf() ); + } + }//ALTRO + else if(fUseFALTRO) + {// Fake ALTRO + fTriggerRawDigitMaker->Add( bunchlist ); + }//Fake ALTRO + } // end while over channel + } //end while over DDL's, of input stream + fTriggerRawDigitMaker->PostProcess(); + TrimDigits(digitsArr); +} - // Find the time,the value and the index of the maximum - Int_t indexmax = 0; - for (Int_t index = 0; index < GetRawFormatTimeBins(); index++) { - gSig->GetPoint(index, time, signal) ; - if (signal >= signalmax) { - signalmax = signal ; - timemax = time ; - indexmax = index; +void AliEMCALRawUtils::TrimDigits(TClonesArray *digitsArr) +{ // rm entries with LGnoHG (unphysical), out of time window, and too bad chi2 + AliEMCALDigit *digit = 0; + Int_t n = 0; + Int_t nDigits = digitsArr->GetEntriesFast(); + TIter nextdigit(digitsArr); + while ((digit = (AliEMCALDigit*) nextdigit())) { + if (digit->GetType() == AliEMCALDigit::kLGnoHG) { + AliDebug(1,Form("Remove digit with id %d, LGnoHG",digit->GetId())); + digitsArr->Remove(digit); } - } - - if ( timemax < GetRawFormatTimeMax() * 0.4 ) { // else its noise - - // Find the start time of the signal; - for (Int_t index = indexmax; index >= 0; index--) { - gSig->GetPoint(index, time, signal) ; - - if (signal>kNoiseThreshold) { - timezero1 = time; - } - else break; + else if(fTimeMin > digit->GetTime() || fTimeMax < digit->GetTime()) { + digitsArr->Remove(digit); + AliDebug(1,Form("Remove digit with id %d, Bad Time %e",digit->GetId(), digit->GetTime())); } - // Find the end time of the signal; - for (Int_t index = indexmax; index < GetRawFormatTimeBins(); index++) { - gSig->GetPoint(index, time, signal) ; - if (signal>kNoiseThreshold) { - timezero2 = time; - } - else break; + else if (0 > digit->GetChi2()) { + digitsArr->Remove(digit); + AliDebug(1,Form("Remove digit with id %d, Bad Chi2 %e",digit->GetId(), digit->GetChi2())); } - - signalF->SetParameter(0, signalmax) ; - // signalF->SetParameter(1, timemax) ; - signalF->SetParameter(1, 0.5*(timezero1+timezero2)) ; - gSig->Fit(signalF, "QRON", "", timezero1, timezero2); //, "QRON") ; - amp = signalF->GetParameter(0) ; - time = signalF->GetParameter(1) - fgTimeTrigger; - } - return; -} -//__________________________________________________________________ -Double_t AliEMCALRawUtils::RawResponseFunction(Double_t *x, Double_t *par) -{ - // Shape of the electronics raw reponse: - // It is a semi-gaussian, 2nd order Gamma function of the general form - // - // t' = (t - t0 + tau) / tau - // F = A * t**N * exp( N * ( 1 - t) ) for t >= 0 - // F = 0 for t < 0 - // - // parameters: - // A: par[0] // Amplitude = peak value - // t0: par[1] - // tau: fgTau - // N: fgOrder - // - Double_t signal ; - Double_t xx = ( x[0] - par[1] + fgTau ) / fgTau ; - - if (xx <= 0) - signal = 0. ; - else { - signal = par[0] * TMath::Power(xx , fgOrder) * TMath::Exp(fgOrder * (1 - xx )) ; - } - return signal ; + else { + digit->SetIndexInList(n); + n++; + } + }//while + + digitsArr->Compress(); + AliDebug(1,Form("N Digits before trimming : %d; after array compression %d",nDigits,digitsArr->GetEntriesFast())); } -//__________________________________________________________________ -Bool_t AliEMCALRawUtils::RawSampledResponse( -const Double_t dtime, const Double_t damp, Int_t * adcH, Int_t * adcL) const -{ - // for a start time dtime and an amplitude damp given by digit, - // calculates the raw sampled response AliEMCAL::RawResponseFunction - const Int_t kRawSignalOverflow = 0x3FF ; - Bool_t lowGain = kFALSE ; - - TF1 signalF("signal", RawResponseFunction, 0, GetRawFormatTimeMax(), 4); - signalF.SetParameter(0, damp) ; - signalF.SetParameter(1, dtime + fgTimeTrigger) ; +void AliEMCALRawUtils::SetFittingAlgorithm(Int_t fitAlgo) +{ // select which fitting algo should be used + delete fRawAnalyzer; // delete doesn't do anything if the pointer is 0x0 + fRawAnalyzer = AliCaloRawAnalyzerFactory::CreateAnalyzer( fitAlgo ); + fRawAnalyzer->SetNsampleCut(5); // requirement for fits to be done, for the new methods + fRawAnalyzer->SetOverflowCut ( OVERFLOWCUT ); + fRawAnalyzer->SetAmpCut(fNoiseThreshold); + fRawAnalyzer->SetFitArrayCut(fNoiseThreshold); +} - for (Int_t iTime = 0; iTime < GetRawFormatTimeBins(); iTime++) { - Double_t time = iTime * GetRawFormatTimeMax() / GetRawFormatTimeBins() ; - Double_t signal = signalF.Eval(time) ; - adcH[iTime] = static_cast(signal + 0.5) ; - if ( adcH[iTime] > kRawSignalOverflow ){ // larger than 10 bits - adcH[iTime] = kRawSignalOverflow ; - lowGain = kTRUE ; - } - signal /= fHighLowGainFactor; - adcL[iTime] = static_cast(signal + 0.5) ; - if ( adcL[iTime] > kRawSignalOverflow) // larger than 10 bits - adcL[iTime] = kRawSignalOverflow ; - } - return lowGain ; -}