Creation of TClonesArray in constructor only, instead of per-event.

[u/mrichter/AliRoot.git] / PHOS / AliPHOSReconstructor.cxx

diff --git a/PHOS/AliPHOSReconstructor.cxx b/PHOS/AliPHOSReconstructor.cxx
index f4a428e0aaad16cd61f8029a6cbaf14f35f20e27..8cd835e431e9f752193a2cf48d6633a8cf4949e2 100644 (file)
--- a/PHOS/AliPHOSReconstructor.cxx
+++ b/PHOS/AliPHOSReconstructor.cxx
@@ -57,10 +57,12 @@ ClassImp(AliPHOSReconstructor)
 Bool_t AliPHOSReconstructor::fgDebug = kFALSE ; 
 AliPHOSRecoParam* AliPHOSReconstructor::fgkRecoParamEmc =0;  // EMC rec. parameters
 AliPHOSRecoParam* AliPHOSReconstructor::fgkRecoParamCpv =0;  // CPV rec. parameters
+TClonesArray*     AliPHOSReconstructor::fgDigitsArray = 0;   // Array of PHOS digits
+TObjArray*        AliPHOSReconstructor::fgEMCRecPoints = 0;   // Array of EMC rec.points
 
 //____________________________________________________________________________
 AliPHOSReconstructor::AliPHOSReconstructor() :
-  fGeom(NULL),fClusterizer(NULL)
+  fGeom(NULL),fClusterizer(NULL),fTSM(NULL),fPID(NULL)
 {
   // ctor
 
@@ -75,7 +77,11 @@ AliPHOSReconstructor::AliPHOSReconstructor() :
   }
 
   fGeom        = AliPHOSGeometry::GetInstance("IHEP","");
-  fClusterizer = new AliPHOSClusterizerv1(fGeom);
+  fClusterizer = new AliPHOSClusterizerv1      (fGeom);
+  fTSM         = new AliPHOSTrackSegmentMakerv1(fGeom);
+  fPID         = new AliPHOSPIDv1              (fGeom);
+  fgDigitsArray = new TClonesArray("AliPHOSDigit",100);
+  fgEMCRecPoints= new TObjArray(100) ;
 }
 
 //____________________________________________________________________________
@@ -84,6 +90,10 @@ AliPHOSReconstructor::AliPHOSReconstructor() :
   // dtor
   delete fGeom;
   delete fClusterizer;
+  delete fTSM;
+  delete fPID;
+  delete fgDigitsArray;
+  delete fgEMCRecPoints;
 } 
 
 //____________________________________________________________________________
@@ -110,31 +120,24 @@ void AliPHOSReconstructor::FillESD(TTree* digitsTree, TTree* clustersTree,
   // then it creates AliESDtracks out of them and
   // write tracks to the ESD
 
-  AliPHOSTrackSegmentMaker *tsm = new AliPHOSTrackSegmentMakerv1(fGeom);
-  AliPHOSPID               *pid = new AliPHOSPIDv1              (fGeom);
 
   // do current event; the loop over events is done by AliReconstruction::Run()
-  tsm->SetESD(esd) ; 
-  tsm->SetInput(clustersTree);
+  fTSM->SetESD(esd) ; 
+  fTSM->SetInput(clustersTree);
   if ( Debug() ) 
-    tsm->Clusters2TrackSegments("deb all") ;
+    fTSM->Clusters2TrackSegments("deb all") ;
   else 
-    tsm->Clusters2TrackSegments("") ;
+    fTSM->Clusters2TrackSegments("") ;
   
-  pid->SetInput(clustersTree, tsm->GetTrackSegments()) ; 
-  pid->SetESD(esd) ; 
+  fPID->SetInput(clustersTree, fTSM->GetTrackSegments()) ; 
+  fPID->SetESD(esd) ; 
   if ( Debug() ) 
-    pid->TrackSegments2RecParticles("deb all") ;
+    fPID->TrackSegments2RecParticles("deb all") ;
   else 
-    pid->TrackSegments2RecParticles("") ;
+    fPID->TrackSegments2RecParticles("") ;
 
-
-  // This function creates AliESDtracks from AliPHOSRecParticles
-  //         and
-  // writes them to the ESD
-
-  TClonesArray *recParticles  = pid->GetRecParticles();
-  Int_t nOfRecParticles = recParticles->GetEntries();
+  TClonesArray *recParticles  = fPID->GetRecParticles();
+  Int_t nOfRecParticles = recParticles->GetEntriesFast();
   
   esd->SetNumberOfPHOSClusters(nOfRecParticles) ; 
   esd->SetFirstPHOSCluster(esd->GetNumberOfCaloClusters()) ;
@@ -148,8 +151,7 @@ void AliPHOSReconstructor::FillESD(TTree* digitsTree, TTree* clustersTree,
     AliError("can't get the branch with the PHOS digits !");
     return;
   }
-  TClonesArray *digitsArray    = new TClonesArray("AliPHOSDigit",100);
-  branch->SetAddress(&digitsArray);
+  branch->SetAddress(&fgDigitsArray);
   branch->GetEntry(0);
 
   // Get the clusters array
@@ -160,8 +162,7 @@ void AliPHOSReconstructor::FillESD(TTree* digitsTree, TTree* clustersTree,
     return;
   }
 
-  TObjArray *emcRecPoints = new TObjArray(100) ;
-  emcbranch->SetAddress(&emcRecPoints);
+  emcbranch->SetAddress(&fgEMCRecPoints);
   emcbranch->GetEntry(0);
 
   //#########Calculate trigger and set trigger info###########
@@ -169,7 +170,7 @@ void AliPHOSReconstructor::FillESD(TTree* digitsTree, TTree* clustersTree,
   AliPHOSTrigger tr ;
   //   tr.SetPatchSize(1);//create 4x4 patches
   tr.SetSimulation(kFALSE);
-  tr.Trigger(digitsArray);
+  tr.Trigger(fgDigitsArray);
   
   Float_t maxAmp2x2  = tr.Get2x2MaxAmplitude();
   Float_t maxAmpnxn  = tr.GetnxnMaxAmplitude();
@@ -223,7 +224,7 @@ void AliPHOSReconstructor::FillESD(TTree* digitsTree, TTree* clustersTree,
   //############# Fill CaloCells ###########
   //########################################
 
-  Int_t nDigits = digitsArray->GetEntries();
+  Int_t nDigits = fgDigitsArray->GetEntries();
   Int_t idignew = 0 ;
   AliDebug(1,Form("%d digits",nDigits));
 
@@ -234,7 +235,7 @@ void AliPHOSReconstructor::FillESD(TTree* digitsTree, TTree* clustersTree,
 
   // Add to CaloCells only EMC digits with non-zero energy 
   for (Int_t idig = 0 ; idig < nDigits ; idig++) {
-    const AliPHOSDigit * dig = (const AliPHOSDigit*)digitsArray->At(idig);
+    const AliPHOSDigit * dig = (const AliPHOSDigit*)fgDigitsArray->At(idig);
     if(dig->GetId() <= knEMC && dig->GetEnergy() > 0 ){
       //printf("i %d; id %d; amp %f; time %e\n",
       //idignew,dig->GetId(),dig->GetEnergy(), dig->GetTime());
@@ -254,10 +255,10 @@ void AliPHOSReconstructor::FillESD(TTree* digitsTree, TTree* clustersTree,
     if (Debug()) 
       rp->Print();
     // Get track segment and EMC rec.point associated with this rec.particle
-    AliPHOSTrackSegment *ts    = static_cast<AliPHOSTrackSegment *>(tsm->GetTrackSegments()
+    AliPHOSTrackSegment *ts    = static_cast<AliPHOSTrackSegment *>(fTSM->GetTrackSegments()
                                                                    ->At(rp->GetPHOSTSIndex()));
 
-    AliPHOSEmcRecPoint  *emcRP = static_cast<AliPHOSEmcRecPoint *>(emcRecPoints->At(ts->GetEmcIndex()));
+    AliPHOSEmcRecPoint  *emcRP = static_cast<AliPHOSEmcRecPoint *>(fgEMCRecPoints->At(ts->GetEmcIndex()));
     AliESDCaloCluster   *ec    = new AliESDCaloCluster() ; 
     
     Float_t xyz[3];
@@ -275,7 +276,7 @@ void AliPHOSReconstructor::FillESD(TTree* digitsTree, TTree* clustersTree,
     Double_t *fracList   = new Double_t[cellMult];
 
     for (Int_t iCell=0; iCell<cellMult; iCell++) {
-      AliPHOSDigit *digit = static_cast<AliPHOSDigit *>(digitsArray->At(digitsList[iCell]));
+      AliPHOSDigit *digit = static_cast<AliPHOSDigit *>(fgDigitsArray->At(digitsList[iCell]));
       absIdList[iCell] = (UShort_t)(digit->GetId());
       if (digit->GetEnergy() > 0)
        fracList[iCell] = rpElist[iCell]/digit->GetEnergy();
@@ -298,8 +299,8 @@ void AliPHOSReconstructor::FillESD(TTree* digitsTree, TTree* clustersTree,
     ec->SetNExMax(emcRP->GetNExMax());          //number of local maxima
     ec->SetEmcCpvDistance(ts->GetCpvDistance("r")); //Only radius, what about separate x,z????
     ec->SetClusterChi2(-1);                     //not yet implemented
-    ec->SetM11(-1) ;                            //not yet implemented
- 
+    ec->SetTOF(emcRP->GetTime()); //Time of flight
+
     //Cells contributing to clusters
     ec->SetNCells(cellMult);
     ec->SetCellsAbsId(absIdList);
@@ -321,13 +322,12 @@ void AliPHOSReconstructor::FillESD(TTree* digitsTree, TTree* clustersTree,
 
     esd->AddCaloCluster(ec);
     delete ec;   
+    delete [] fracList;
+    delete [] absIdList;
   }
-  digitsArray ->Delete();
-  delete digitsArray;
-  emcRecPoints->Delete();
-  delete emcRecPoints;
-  delete tsm;
-  delete pid;
+  fgDigitsArray ->Delete();
+  fgEMCRecPoints->Delete();
+  recParticles  ->Delete();
 }
 
 //____________________________________________________________________________
@@ -364,8 +364,6 @@ void  AliPHOSReconstructor::ConvertDigits(AliRawReader* rawReader, TTree* digits
     else
       dc=new AliPHOSRawDecoder(rawReader,mapping);
 
-  dc->SetOldRCUFormat(fgkRecoParamEmc->IsOldRCUFormat());
-  
   dc->SubtractPedestals(fgkRecoParamEmc->SubtractPedestals());
   
   TClonesArray *digits = new TClonesArray("AliPHOSDigit",1);