Particle identification improvment by Gustavo

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

diff --git a/PHOS/AliPHOSRecPoint.cxx b/PHOS/AliPHOSRecPoint.cxx
index e07602c962819e64e1823a8ec059ea3aabf99688..3490d20095a364da77baf21bff5e8255b2654ad3 100644 (file)
--- a/PHOS/AliPHOSRecPoint.cxx
+++ b/PHOS/AliPHOSRecPoint.cxx
@@ -22,17 +22,17 @@
 
 // --- ROOT system ---
 #include "TPad.h"
+#include "TClonesArray.h"
 
 // --- Standard library ---
 #include <iostream.h>
-#include <stdio.h>
 
 // --- AliRoot header files ---
 
 #include "AliPHOSGeometry.h"
 #include "AliPHOSDigit.h"
 #include "AliPHOSRecPoint.h"
-#include "AliPHOSIndexToObject.h"
+#include "AliPHOSGetter.h"
 
 ClassImp(AliPHOSRecPoint)
 
@@ -43,8 +43,19 @@ AliPHOSRecPoint::AliPHOSRecPoint()
 {
   // ctor
 
-  fGeom = (AliPHOSGeometry*) AliPHOSGeometry::GetInstance() ;
+  fMaxTrack = 200 ;
   fPHOSMod = 0;
+
+}
+
+//____________________________________________________________________________
+AliPHOSRecPoint::AliPHOSRecPoint(const char * opt) : AliRecPoint(opt)
+{
+  // ctor
+  
+  fMaxTrack = 200 ;
+  fPHOSMod = 0;
+  
 }
 
 //____________________________________________________________________________
@@ -96,7 +107,9 @@ void AliPHOSRecPoint::ExecuteEvent(Int_t event, Int_t px, Int_t py)
     
   case kButton1Down:{
     AliPHOSDigit * digit ;
-    AliPHOSGeometry * phosgeom =  (AliPHOSGeometry *) fGeom ;
+    AliPHOSGetter * gime = AliPHOSGetter::GetInstance() ; 
+    AliPHOSGeometry * phosgeom =  const_cast<AliPHOSGeometry*>(gime->PHOSGeometry());
+
     Int_t iDigit;
     Int_t relid[4] ;
   
@@ -105,7 +118,8 @@ void AliPHOSRecPoint::ExecuteEvent(Int_t event, Int_t px, Int_t py)
     Float_t * zi = new Float_t [kMulDigit] ;
     
     for(iDigit = 0; iDigit < kMulDigit; iDigit++) {
-      digit = (AliPHOSDigit *) fDigitsList[iDigit];
+      Fatal("AliPHOSRecPoint::ExecuteEvent", "-> Something wrong with the code"); 
+      digit = 0 ; //dynamic_cast<AliPHOSDigit *>((fDigitsList)[iDigit]);
       phosgeom->AbsToRelNumbering(digit->GetId(), relid) ;
       phosgeom->RelPosInModule(relid, xi[iDigit], zi[iDigit]) ;
     }
@@ -152,75 +166,90 @@ break;
     
   }
 }
+//____________________________________________________________________________
+void AliPHOSRecPoint::EvalAll(Float_t logWeight,TClonesArray * digits) {
+  //evaluates (if necessary) all RecPoint data members 
 
+  EvalPrimaries(digits) ;
+}
 //____________________________________________________________________________
-Int_t AliPHOSRecPoint::GetPHOSMod()
+void AliPHOSRecPoint::EvalPHOSMod(AliPHOSDigit * digit) 
 {
   // Returns the PHOS module in which the RecPoint is found
- 
-  if(fPHOSMod > 0) 
-    return fPHOSMod ;
-
-  AliPHOSIndexToObject * please =  AliPHOSIndexToObject::GetInstance() ; 
 
-  Int_t relid[4] ;
-  
+  if( fPHOSMod == 0){
+  Int_t relid[4] ; 
   
-  AliPHOSDigit * digit   ;
-  digit = (AliPHOSDigit *) ( please->GimeDigit(fDigitsList[0]) ) ;
-  AliPHOSGeometry * phosgeom =  (AliPHOSGeometry *) fGeom ;
+  AliPHOSGetter * gime = AliPHOSGetter::GetInstance() ; 
+  AliPHOSGeometry * phosgeom =  const_cast<AliPHOSGeometry*>(gime->PHOSGeometry());
 
   phosgeom->AbsToRelNumbering(digit->GetId(), relid) ;
   fPHOSMod = relid[0];
-  return fPHOSMod ;
+  }
 }
 
 //______________________________________________________________________________
-Int_t * AliPHOSRecPoint::GetPrimaries(Int_t & number)
+void  AliPHOSRecPoint::EvalPrimaries(TClonesArray * digits)
 {
-  // Constructs the list of primary particles which have contributed to this RecPoint
+  // Constructs the list of primary particles (tracks) which have contributed to this RecPoint
   
   AliPHOSDigit * digit ;
-  Int_t index ;
-  Int_t maxcounter = 20 ;
-  Int_t counter    = 0 ;
-  Int_t * tempo    = new Int_t[maxcounter] ;
-  AliPHOSIndexToObject * please = AliPHOSIndexToObject::GetInstance() ;
-  
+  Int_t * tempo    = new Int_t[fMaxTrack] ;
+
+  Int_t index ;  
   for ( index = 0 ; index < GetDigitsMultiplicity() ; index++ ) { // all digits
-    digit = please->GimeDigit( fDigitsList[index] ) ; 
+    digit = dynamic_cast<AliPHOSDigit *>(digits->At( fDigitsList[index] )) ; 
     Int_t nprimaries = digit->GetNprimary() ;
-    Int_t * newprimaryarray = new Int_t[nprimaries] ;
-    Int_t ii ; 
-    for ( ii = 0 ; ii < nprimaries ; ii++)
-      newprimaryarray[ii] = digit->GetPrimary(ii+1) ; 
-    Int_t jndex ;
-    for ( jndex = 0 ; jndex < nprimaries ; jndex++ ) { // all primaries in digit
-      if ( counter > maxcounter ) {
-       number = - 1 ;
-       cout << "AliPHOSRecPoint::GetNprimaries ERROR > increase maxcounter " << endl ;
-       break ;
-      }
-      Int_t newprimary = newprimaryarray[jndex] ;
-      Int_t kndex ;
-      Bool_t already = kFALSE ;
-      for ( kndex = 0 ; kndex < counter ; kndex++ ) { //check if not already stored
-       if ( newprimary == tempo[kndex] ){
-         already = kTRUE ;
+    if(nprimaries){
+      Int_t * newprimaryarray = new Int_t[nprimaries] ;
+      Int_t ii ; 
+      for ( ii = 0 ; ii < nprimaries ; ii++)
+       newprimaryarray[ii] = digit->GetPrimary(ii+1) ; 
+
+      Int_t jndex ;
+      for ( jndex = 0 ; jndex < nprimaries ; jndex++ ) { // all primaries in digit
+       if ( fMulTrack > fMaxTrack ) {
+         fMulTrack = - 1 ;
+         cout << "AliPHOSRecPoint::GetNprimaries ERROR > increase fMaxTrack " << endl ;
          break ;
        }
-      } // end of check
-      if ( !already) { // store it
-       tempo[counter] = newprimary ; 
-       counter++ ;
-      } // store it
-    } // all primaries in digit
-    delete newprimaryarray ; 
+       Int_t newprimary = newprimaryarray[jndex] ;
+       Int_t kndex ;
+       Bool_t already = kFALSE ;
+       for ( kndex = 0 ; kndex < fMulTrack ; kndex++ ) { //check if not already stored
+         if ( newprimary == tempo[kndex] ){
+           already = kTRUE ;
+           break ;
+         }
+       } // end of check
+       if ( !already) { // store it
+         tempo[fMulTrack] = newprimary ; 
+         fMulTrack++ ;
+       } // store it
+      } // all primaries in digit
+      delete [] newprimaryarray ; 
+    }
   } // all digits
 
-  number = counter ; 
-  return tempo ; 
+  if(fMulTrack)
+    fTracksList = new Int_t[fMulTrack] ;
+  for(index = 0; index < fMulTrack; index++)
+    fTracksList[index] = tempo[index] ;
+  
+  delete [] tempo ;
+  
 }
+//____________________________________________________________________________
+void AliPHOSRecPoint::GetGlobalPosition(TVector3 & gpos, TMatrix & gmat) const
+{
+  // returns the position of the cluster in the global reference system of ALICE
+  // and the uncertainty on this position
+  
+  
+  AliPHOSGetter::GetInstance()->PHOSGeometry()->GetGlobal(this, gpos, gmat) ;
+ 
+}
+
 
 //______________________________________________________________________________
 void AliPHOSRecPoint::Paint(Option_t *)