Smalle changes required by HLT (Jochen)
authorcvetan <cvetan@f7af4fe6-9843-0410-8265-dc069ae4e863>
Tue, 21 Sep 2010 14:14:06 +0000 (14:14 +0000)
committercvetan <cvetan@f7af4fe6-9843-0410-8265-dc069ae4e863>
Tue, 21 Sep 2010 14:14:06 +0000 (14:14 +0000)
VZERO/AliVZEROReconstructor.cxx
VZERO/AliVZEROReconstructor.h

index 0e8f763..0d5f98c 100644 (file)
@@ -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);
 
index 41f81c9..4252918 100644 (file)
@@ -57,6 +57,8 @@ public:
   enum {kInvalidADC   =  -1024,
         kInvalidTime  =  -1024};
 
+  AliESDVZERO*    GetESDVZERO() { return fESDVZERO; }
+
 protected:
   AliESDVZERO*        fESDVZERO;       // ESD output object  
   AliESDEvent*             fESD;       // ESD object