From 829852e8496f5217fe54c3aa1675d4a60ceadfdd Mon Sep 17 00:00:00 2001 From: cvetan Date: Tue, 21 Sep 2010 14:14:06 +0000 Subject: [PATCH] Smalle changes required by HLT (Jochen) --- VZERO/AliVZEROReconstructor.cxx | 23 ++++++++++++++--------- VZERO/AliVZEROReconstructor.h | 2 ++ 2 files changed, 16 insertions(+), 9 deletions(-) diff --git a/VZERO/AliVZEROReconstructor.cxx b/VZERO/AliVZEROReconstructor.cxx index 0e8f763edd7..0d5f98c5233 100644 --- a/VZERO/AliVZEROReconstructor.cxx +++ b/VZERO/AliVZEROReconstructor.cxx @@ -112,8 +112,11 @@ AliVZEROReconstructor::~AliVZEROReconstructor() { // destructor - delete fESDVZERO; + if(fESDVZERO) + delete fESDVZERO; + if(fESDVZEROfriend) delete fESDVZEROfriend; + if(fDigitsArray) delete fDigitsArray; } @@ -333,14 +336,16 @@ void AliVZEROReconstructor::FillESD(TTree* digitsTree, TTree* /*clustersTree*/, time[pmNumber] = CorrectLeadingTime(pmNumber,digit->Time(),adc[pmNumber]); 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], - digit->Time(),time[pmNumber], - integrator, - digit->ChargeADC(8),digit->ChargeADC(9),digit->ChargeADC(10), - digit->ChargeADC(11),digit->ChargeADC(12), - fCalibData->GetPedestal(pmNumber),fCalibData->GetSigma(pmNumber), - fCalibData->GetPedestal(pmNumber+64),fCalibData->GetSigma(pmNumber+64), - aBBflag[pmNumber],aBGflag[pmNumber])); + 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], + digit->Time(),time[pmNumber], + integrator, + digit->ChargeADC(8),digit->ChargeADC(9),digit->ChargeADC(10), + digit->ChargeADC(11),digit->ChargeADC(12), + fCalibData->GetPedestal(pmNumber),fCalibData->GetSigma(pmNumber), + fCalibData->GetPedestal(pmNumber+64),fCalibData->GetSigma(pmNumber+64), + aBBflag[pmNumber],aBGflag[pmNumber])); + }; mult[pmNumber] = adc[pmNumber]*fCalibData->GetMIPperADC(pmNumber); diff --git a/VZERO/AliVZEROReconstructor.h b/VZERO/AliVZEROReconstructor.h index 41f81c90a09..4252918e872 100644 --- a/VZERO/AliVZEROReconstructor.h +++ b/VZERO/AliVZEROReconstructor.h @@ -57,6 +57,8 @@ public: enum {kInvalidADC = -1024, kInvalidTime = -1024}; + AliESDVZERO* GetESDVZERO() { return fESDVZERO; } + protected: AliESDVZERO* fESDVZERO; // ESD output object AliESDEvent* fESD; // ESD object -- 2.43.0