X-Git-Url: http://git.uio.no/git/?a=blobdiff_plain;f=TOF%2FAliTOFT0maker.cxx;h=88d542f768e2e8c38344fe12de8917505bd5a143;hb=d24e73f28fd645e8bf26334e7dc3c6cc018ee029;hp=c82fbcd054bd96ab04e29c3c3c917621fddc8944;hpb=69ccfdf60faf1da8f8246c62e8ca7f88c64153ee;p=u%2Fmrichter%2FAliRoot.git

diff --git a/TOF/AliTOFT0maker.cxx b/TOF/AliTOFT0maker.cxx
index c82fbcd054b..88d542f768e 100644
--- a/TOF/AliTOFT0maker.cxx
+++ b/TOF/AliTOFT0maker.cxx
@@ -73,7 +73,8 @@ AliTOFT0maker::AliTOFT0maker():
   fKmask(0),
   fT0width(150.),
   fT0spreadExt(-1.),
-  fT0fillExt(0)
+  fT0fillExt(0),
+  fTOFT0algorithm(1)
 {
   // ctr
   fCalculated[0] = 0;
@@ -109,7 +110,8 @@ AliTOFT0maker::AliTOFT0maker(AliESDpid *externalPID, AliTOFcalib *tofCalib):
     fKmask(0),
     fT0width(150.),
     fT0spreadExt(-1.),
-    fT0fillExt(0)
+    fT0fillExt(0),
+    fTOFT0algorithm(1)
 {
   // ctr
   fCalculated[0] = 0;
@@ -138,7 +140,6 @@ AliTOFT0maker::AliTOFT0maker(AliESDpid *externalPID, AliTOFcalib *tofCalib):
 AliTOFT0maker::~AliTOFT0maker()
 {
   // dtor
-
   delete fT0TOF;
   if (!fExternalPIDFlag) delete fPIDesd;
 }
@@ -184,9 +185,10 @@ Double_t* AliTOFT0maker::ComputeT0TOF(AliESDEvent *esd,Double_t t0time,Double_t
 
   Float_t thrGood = TMath::Max(Float_t(500.),fT0width*3);
 
-  fT0TOF->Init(esd);
-  AliTOFT0v1* t0maker= fT0TOF;
 
+  fT0TOF->Init(esd);
+  AliTOFT0v1* t0maker = fT0TOF;
+  if (fTOFT0algorithm==2) t0maker->SetOptimization(kTRUE);
   t0maker->DefineT0("all",1.5,3.0);
   t0tof[0] = t0maker->GetResult(0);
   t0tof[1] = t0maker->GetResult(1);
@@ -522,6 +524,8 @@ void     AliTOFT0maker::WriteInESD(AliESDEvent *esd){
   
     esd->SetTOFHeader(tofHeader);
 
+    delete tofHeader;
+
     AliDebug(1,Form("resTOF=%f T0spread=%f t0Gen=%f t0resGen=%f",fTimeResolution,fT0width,t0Gen,t0ResGen));
     AliDebug(1,Form("%d ",nt0));
     for (Int_t ii=0; ii<nt0; ii++)