From: gconesab Date: Tue, 15 Dec 2009 22:11:56 +0000 (+0000) Subject: Change back number of time sample bins to 256 in AliEMCALRawUtils, correct some comme... X-Git-Url: http://git.uio.no/git/?a=commitdiff_plain;h=89d338a6f75bf28cabaac4bd4999a022bb080a64;p=u%2Fmrichter%2FAliRoot.git Change back number of time sample bins to 256 in AliEMCALRawUtils, correct some commented deletes in AliEMCALReconstructor that should not have been committed --- diff --git a/EMCAL/AliEMCALRawUtils.cxx b/EMCAL/AliEMCALRawUtils.cxx index 93b9607a1d0..2b7500b80bb 100644 --- a/EMCAL/AliEMCALRawUtils.cxx +++ b/EMCAL/AliEMCALRawUtils.cxx @@ -52,7 +52,7 @@ class AliEMCALDigitizer; ClassImp(AliEMCALRawUtils) // Signal shape parameters -Int_t AliEMCALRawUtils::fgTimeBins = 100; // number of sampling bins of the raw RO signal (we typically use 15-50; theoretical max is 1k+) +Int_t AliEMCALRawUtils::fgTimeBins = 256; // number of sampling bins of the raw RO signal (we typically use 15-50; theoretical max is 1k+) Double_t AliEMCALRawUtils::fgTimeBinWidth = 100E-9 ; // each sample is 100 ns Double_t AliEMCALRawUtils::fgTimeTrigger = 1.5E-6 ; // 15 time bins ~ 1.5 musec diff --git a/EMCAL/AliEMCALReconstructor.cxx b/EMCAL/AliEMCALReconstructor.cxx index fb911183407..1c8a5a3500e 100644 --- a/EMCAL/AliEMCALReconstructor.cxx +++ b/EMCAL/AliEMCALReconstructor.cxx @@ -187,8 +187,8 @@ void AliEMCALReconstructor::ConvertDigits(AliRawReader* rawReader, TTree* digits fgRawUtils->Raw2Digits(rawReader,digitsArr,fPedestalData); digitsTree->Fill(); - //digitsArr->Delete(); //Do not delete digits array are not created here. - //delete digitsArr; + digitsArr->Delete(); + delete digitsArr; } @@ -448,7 +448,7 @@ void AliEMCALReconstructor::FillESD(TTree* digitsTree, TTree* clustersTree, pid->RunPID(esd); delete pid; - //delete digits; + delete digits; delete clusters; // printf(" ## AliEMCALReconstructor::FillESD() is ended : ncl %i -> %i ### \n ",nClusters, nClustersNew);