Fill missing ESD fields

diff --git a/PHOS/AliPHOSRecParticle.cxx b/PHOS/AliPHOSRecParticle.cxx
index 78224515d148b1011588586dd441e979dab4414c..11c700fb6d436df4c5da2a69051b70667372a48d 100644 (file)
--- a/PHOS/AliPHOSRecParticle.cxx
+++ b/PHOS/AliPHOSRecParticle.cxx
@@ -220,6 +220,8 @@ Int_t AliPHOSRecParticle::GetPrimaryIndex() const
 
   AliPHOSHit *hit = 0;
   TClonesArray *hits = gime->Hits();
+  if (hits==0) return -12345;
+
   Double_t maxedep  =  0;
   Int_t    maxtrack = -1;
   Int_t    nHits    = hits ->GetEntries();

diff --git a/PHOS/AliPHOSReconstructor.cxx b/PHOS/AliPHOSReconstructor.cxx
index c8985249d69bac750f032dd0c9ee8c618c2de737..8d99cb83d6b9f80f6d7f551ac33424206484fff7 100644 (file)
--- a/PHOS/AliPHOSReconstructor.cxx
+++ b/PHOS/AliPHOSReconstructor.cxx
@@ -111,9 +111,11 @@ void AliPHOSReconstructor::FillESD(AliRunLoader* runLoader, AliESD* esd) const
 
   Int_t eventNumber = runLoader->GetEventNumber() ;
 
-  AliPHOSGetter::Instance()->Event(eventNumber, "P") ; 
-  TClonesArray *recParticles = AliPHOSGetter::Instance()->RecParticles();
+  AliPHOSGetter *gime = AliPHOSGetter::Instance();
+  gime->Event(eventNumber, "DRTP") ; 
+  TClonesArray *recParticles  = gime->RecParticles();
   Int_t nOfRecParticles = recParticles->GetEntries();
+
   esd->SetNumberOfPHOSClusters(nOfRecParticles) ; 
   esd->SetFirstPHOSCluster(esd->GetNumberOfCaloClusters()) ; 
 
@@ -121,16 +123,45 @@ void AliPHOSReconstructor::FillESD(AliRunLoader* runLoader, AliESD* esd) const
     AliPHOSRecParticle * rp = dynamic_cast<AliPHOSRecParticle*>(recParticles->At(recpart));
     if (Debug()) 
       rp->Print();
-    AliESDCaloCluster * ec = new AliESDCaloCluster() ; 
-//     AliESDtrack * et = new AliESDtrack() ; 
+    // Get track segment and EMC rec.point associated with this rec.particle
+    AliPHOSTrackSegment *ts    = gime->TrackSegment(rp->GetPHOSTSIndex());
+    AliPHOSEmcRecPoint  *emcRP = gime->EmcRecPoint(ts->GetEmcIndex());
+    AliESDCaloCluster   *ec    = new AliESDCaloCluster() ; 
+
     // fills the ESDCaloCluster
     Float_t xyz[3];
     for (Int_t ixyz=0; ixyz<3; ixyz++) 
       xyz[ixyz] = rp->GetPos()[ixyz];
-    ec->SetGlobalPosition(xyz);
-    ec->SetClusterEnergy(rp->Energy());
-    ec->SetPid          (rp->GetPID()) ;
-//     ec->SetPrimaryIndex (rp->GetPrimaryIndex()); // for dry events only
+
+    Int_t  digitMult  = emcRP->GetDigitsMultiplicity();
+    Int_t *digitsList = emcRP->GetDigitsList();
+    UShort_t *amplList  = new UShort_t[digitMult];
+    UShort_t *timeList  = new UShort_t[digitMult];
+    UShort_t *digiList  = new UShort_t[digitMult];
+
+    // Convert Float_t* and Int_t* to UShort_t* to save memory
+    for (Int_t iDigit=0; iDigit<digitMult; iDigit++) {
+      AliPHOSDigit *digit = gime->Digit(digitsList[iDigit]);
+      amplList[iDigit] = (UShort_t)(digit->GetEnergy()*500);
+      amplList[iDigit] = (UShort_t)(digit->GetTime()*1e9*100);
+      digiList[iDigit] = (UShort_t)(digit->GetId());
+    }
+    ec->SetGlobalPosition(xyz);                 //rec.point position in MARS
+    ec->SetClusterEnergy(rp->Energy());         //total particle energy
+    ec->SetClusterDisp(emcRP->GetDispersion()); //cluster dispersion
+    ec->SetPid          (rp->GetPID()) ;        //array of particle identification
+    ec->SetPrimaryIndex (rp->GetPrimaryIndex());//index of primary particle (for simulations)
+    ec->SetM02(emcRP->GetM2x()) ;               //second moment M2x
+    ec->SetM20(emcRP->GetM2z()) ;               //second moment M2z
+    ec->SetNExMax(emcRP->GetNExMax());          //number of local maxima
+    ec->SetNumberOfDigits(digitMult);           //digit multiplicity
+    ec->SetDigitAmplitude(amplList);            //energies in 1/500 of GeV
+    ec->SetDigitTime(timeList);                 //times in 1/100 on ns
+    ec->SetDigitIndex(digiList);                //abs id of the cell
+    ec->SetEmcCpvDistance(-1);                  //not yet implemented
+    ec->SetClusterChi2(-1);                     //not yet implemented
+    ec->SetM11(-1) ;                            //not yet implemented
+
     // add the track to the esd object
     esd->AddCaloCluster(ec);
     delete ec;