New version of the trigger code (E.Lopez)

[u/mrichter/AliRoot.git] / EMCAL / AliEMCALReconstructor.cxx

diff --git a/EMCAL/AliEMCALReconstructor.cxx b/EMCAL/AliEMCALReconstructor.cxx
index 70aca110c64220c829706f0ec2660a52e6fafaaf..40a65ed21c7b615851beacc241ad400bb391caaa 100644 (file)
--- a/EMCAL/AliEMCALReconstructor.cxx
+++ b/EMCAL/AliEMCALReconstructor.cxx
@@ -97,26 +97,28 @@ void AliEMCALReconstructor::Reconstruct(AliRunLoader* runLoader, AliRawReader* r
 void AliEMCALReconstructor::FillESD(AliRunLoader* runLoader, AliESD* esd) const
 {
   // Called by AliReconstruct after Reconstruct() and global tracking and vertxing 
-  
+
   Int_t eventNumber = runLoader->GetEventNumber() ;
 
   TString headerFile(runLoader->GetFileName()) ; 
   TString branchName(runLoader->GetEventFolder()->GetName()) ;  
-
   // Creates AliESDCaloCluster from AliEMCALRecPoints 
   AliRunLoader *rl = AliRunLoader::GetRunLoader();
   AliEMCALLoader *emcalLoader = dynamic_cast<AliEMCALLoader*>(rl->GetDetectorLoader("EMCAL"));
   rl->LoadRecPoints();
+  rl->LoadKinematics(); // To get the primary label
+  rl->LoadDigits();     // To get the primary label
+  rl->LoadHits();       // To get the primary label
   rl->GetEvent(eventNumber);
   TObjArray *clusters = emcalLoader->RecPoints();
   Int_t nClusters = clusters->GetEntries();
   esd->SetNumberOfEMCALClusters(nClusters) ; 
   esd->SetFirstEMCALCluster(esd->GetNumberOfCaloClusters()) ; 
+
   for (Int_t iClust = 0 ; iClust < nClusters ; iClust++) {
     const AliEMCALRecPoint * clust = emcalLoader->RecPoint(iClust);
 
     if (Debug()) clust->Print();
-
     AliESDCaloCluster * ec = new AliESDCaloCluster() ; 
     // fills the ESDCaloCluster
     Float_t xyz[3];
@@ -124,7 +126,7 @@ void AliEMCALReconstructor::FillESD(AliRunLoader* runLoader, AliESD* esd) const
     clust->GetGlobalPosition(gpos);
     for (Int_t ixyz=0; ixyz<3; ixyz++) 
       xyz[ixyz] = gpos[ixyz];
-   
+
     Int_t digitMult = clust->GetMultiplicity();
     UShort_t *amplList = new UShort_t[digitMult];
     UShort_t *timeList = new UShort_t[digitMult];
@@ -132,23 +134,36 @@ void AliEMCALReconstructor::FillESD(AliRunLoader* runLoader, AliESD* esd) const
     Float_t *amplFloat = clust->GetEnergiesList();
     Float_t *timeFloat = clust->GetTimeList();
     Int_t   *digitInts = clust->GetAbsId();
-    // Convert Float_t* and Int_t* to UShort_t* to save memory
-    for (Int_t iDigit=0; iDigit<digitMult; iDigit++) {
-      amplList[iDigit] = (UShort_t)(amplFloat[iDigit]*500);
-      timeList[iDigit] = (UShort_t)(timeFloat[iDigit]*1e9*100);
-      digiList[iDigit] = (UShort_t)(digitInts[iDigit]);
-    }
+    Float_t *elipAxis  = new Float_t();
+    clust->GetElipsAxis(elipAxis);
 
+   // Convert Float_t* and Int_t* to UShort_t* to save memory
+    Int_t newdigitMult = digitMult ;
+    for (Int_t iDigit=0; iDigit<digitMult; iDigit++) {
+      if(timeFloat[iDigit] < 65536/1e9*100){
+       amplList[iDigit] = (UShort_t)(amplFloat[iDigit]*500);
+       timeList[iDigit] = (UShort_t)(timeFloat[iDigit]*1e9*100); //Time in units of 100 ns = 0.1 ps
+       digiList[iDigit] = (UShort_t)(digitInts[iDigit]);
+      }
+      else
+       newdigitMult =  newdigitMult - 1 ;
+    } 
+ 
     ec->SetClusterType(clust->GetClusterType());
     ec->SetGlobalPosition(xyz);
     ec->SetClusterEnergy(clust->GetEnergy());
-    ec->SetClusterDisp(clust->GetDispersion());
-    ec->SetClusterChi2(-1); //not yet implemented
-    ec->SetNumberOfDigits(clust->GetMultiplicity());
     ec->SetDigitAmplitude(amplList); //energies
     ec->SetDigitTime(timeList);      //times
     ec->SetDigitIndex(digiList);     //indices
-
+    ec->SetNumberOfDigits(newdigitMult);
+    if(clust->GetClusterType()== AliEMCALRecPoint::kClusterv1){
+      ec->SetClusterDisp(clust->GetDispersion());
+      ec->SetClusterChi2(-1); //not yet implemented
+      ec->SetM02(elipAxis[0]*elipAxis[0]) ;
+      ec->SetM20(elipAxis[1]*elipAxis[1]) ;
+      ec->SetM11(-1) ;        //not yet implemented
+      ec->SetPrimaryIndex(clust->GetPrimaryIndex());
+    }
     // add the cluster to the esd object
     esd->AddCaloCluster(ec);
     delete ec;