Added PHOS/macros/Trigger/raw and contained code.

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

diff --git a/PHOS/AliPHOSEmcRecPoint.cxx b/PHOS/AliPHOSEmcRecPoint.cxx
index 9b11b71ad715e5d3f141ac7007e8ab9e54456b61..19b72b15a7d1497b43a77883367f9a384153d851 100644 (file)
--- a/PHOS/AliPHOSEmcRecPoint.cxx
+++ b/PHOS/AliPHOSEmcRecPoint.cxx
@@ -72,6 +72,10 @@ AliPHOSEmcRecPoint::AliPHOSEmcRecPoint() :
   fMulDigit   = 0 ;  
   fAmp   = 0. ;   
   fLocPos.SetX(1000000.)  ;      //Local position should be evaluated
+
+  fLambda[0] = 0.;
+  fLambda[1] = 0.;
+
 }
 
 //____________________________________________________________________________
@@ -86,6 +90,9 @@ AliPHOSEmcRecPoint::AliPHOSEmcRecPoint(const char * opt) :
   fMulDigit   = 0 ;  
   fAmp   = 0. ;   
   fLocPos.SetX(1000000.)  ;      //Local position should be evaluated
+  
+  fLambda[0] = 0.;
+  fLambda[1] = 0.;
 }
 
 //____________________________________________________________________________
@@ -101,7 +108,11 @@ AliPHOSEmcRecPoint::AliPHOSEmcRecPoint(const AliPHOSEmcRecPoint & rp) :
   fAmp        = rp.fAmp ;   
   if (rp.fMulDigit>0) fEnergyList = new Float_t[rp.fMulDigit] ;
   for(Int_t index = 0 ; index < fMulDigit ; index++) 
-    fEnergyList[index] = rp.fEnergyList[index] ; 
+    fEnergyList[index] = rp.fEnergyList[index] ;
+
+  for(Int_t i=0; i<2; i++) {
+    fLambda[i] = rp.fLambda[i];
+  }
 }
 
 //____________________________________________________________________________
@@ -313,7 +324,7 @@ void AliPHOSEmcRecPoint::ExecuteEvent(Int_t event, Int_t, Int_t) /*const*/
     // 2. gets the histogram title
     
     Text_t title[100] ; 
-    sprintf(title,"Energy=%1.2f GeV ; Digits ; %d ", GetEnergy(), GetDigitsMultiplicity()) ;
+    snprintf(title,100,"Energy=%1.2f GeV ; Digits ; %d ", GetEnergy(), GetDigitsMultiplicity()) ;
     
     if (!histo) {
       delete histo ; 
@@ -729,10 +740,12 @@ void  AliPHOSEmcRecPoint::EvalPrimaries(TClonesArray * digits)
   Float_t emax=0.;
   Int_t imaxDigit=0;
   for(Int_t id=0; id<GetDigitsMultiplicity(); id++){
-    if(emax<fEnergyList[id])
+    if(emax<fEnergyList[id]){
       imaxDigit=id ;
+      emax=fEnergyList[id];
+    }
   }
-  digit = dynamic_cast<AliPHOSDigit *>(digits->At( fDigitsList[imaxDigit] )) ; 
+  digit = static_cast<AliPHOSDigit *>(digits->At( fDigitsList[imaxDigit] )) ; 
   Int_t nprimaries = digit->GetNprimary() ;
   if ( nprimaries > fMaxTrack ) {
     fMulTrack = - 1 ;
@@ -747,7 +760,7 @@ void  AliPHOSEmcRecPoint::EvalPrimaries(TClonesArray * digits)
   for (Int_t index = 0 ; index < GetDigitsMultiplicity() ; index++ ) { // all digits
     if(index==imaxDigit) //already in
       continue ; 
-    digit = dynamic_cast<AliPHOSDigit *>(digits->At( fDigitsList[index] )) ; 
+    digit = static_cast<AliPHOSDigit *>(digits->At( fDigitsList[index] )) ; 
     nprimaries = digit->GetNprimary() ;
     for(Int_t ipr=0; ipr<nprimaries; ipr++){
       Int_t iprimary = digit->GetPrimary(ipr+1) ;
@@ -773,8 +786,9 @@ void  AliPHOSEmcRecPoint::EvalPrimaries(TClonesArray * digits)
     if(fTracksList)delete [] fTracksList;
     fTracksList = new Int_t[fMulTrack] ;
   }
-  for(Int_t index = 0; index < fMulTrack; index++)
+  for(Int_t index = 0; index < fMulTrack; index++){
     fTracksList[index] = tempo[index] ;
+  }
   
   delete [] tempo ;
   
@@ -966,11 +980,11 @@ void AliPHOSEmcRecPoint::EvalTime(TClonesArray * /*digits*/)
 */  
 }
 //____________________________________________________________________________
-void AliPHOSEmcRecPoint::Purify(Float_t threshold){
+void AliPHOSEmcRecPoint::Purify(Float_t threshold, const TClonesArray * digits){
   //Removes digits below threshold
 
-  Int_t * tempo = new Int_t[fMaxDigit]; 
-  Float_t * tempoE =  new Float_t[fMaxDigit];
+  Int_t tempo[fMaxDigit]; 
+  Float_t tempoE[fMaxDigit];
 
   Int_t mult = 0 ;
   for(Int_t iDigit=0;iDigit< fMulDigit ;iDigit++){
@@ -980,8 +994,43 @@ void AliPHOSEmcRecPoint::Purify(Float_t threshold){
       mult++ ;
     }
   }
-  
-  fMulDigit = mult ;
+
+  if(mult==0){ //too soft cluster
+    fMulDigit =0 ;
+    fAmp = 0.; //Recalculate total energy
+  }
+    
+  //Remove non-connected cells
+  Int_t index[mult] ;
+  Bool_t used[mult] ;
+  for(Int_t i=0; i<mult; i++) used[i]=0 ;
+  Int_t inClu=0 ;
+  Double_t eMax=0. ;
+  //find maximum
+  for(Int_t iDigit=0; iDigit<mult; iDigit++) {
+    if(eMax<tempoE[iDigit]){
+      eMax=tempoE[iDigit];
+      index[0]=iDigit ;
+      inClu=1 ;
+    }
+  }
+  if(mult>0)
+    used[index[0]]=kTRUE ; //mark as used
+  for(Int_t i=0; i<inClu; i++){
+    AliPHOSDigit * digit = (AliPHOSDigit *) digits->At(tempo[index[i]]) ; 
+    for(Int_t iDigit=0 ;iDigit<mult; iDigit++){
+      if(used[iDigit]) //already used
+        continue ;
+      AliPHOSDigit * digitN = (AliPHOSDigit *) digits->At(tempo[iDigit]) ;     
+      if(AreNeighbours(digit,digitN)){
+       index[inClu]= iDigit ;
+       inClu++ ;
+       used[iDigit]=kTRUE ;
+      }
+    }
+  }
+     
+  fMulDigit = inClu ;
   delete [] fDigitsList ;
   delete [] fEnergyList ;
   fDigitsList = new Int_t[fMulDigit];
@@ -989,14 +1038,10 @@ void AliPHOSEmcRecPoint::Purify(Float_t threshold){
 
   fAmp = 0.; //Recalculate total energy
   for(Int_t iDigit=0;iDigit< fMulDigit ;iDigit++){
-     fDigitsList[iDigit] = tempo[iDigit];
-     fEnergyList[iDigit] = tempoE[iDigit] ;
-     fAmp+=tempoE[iDigit];
-  }
-      
-  delete [] tempo ;
-  delete [] tempoE ;
-
+     fDigitsList[iDigit] = tempo[index[iDigit]];
+     fEnergyList[iDigit] = tempoE[index[iDigit]] ;
+     fAmp+=tempoE[index[iDigit]];
+  }      
 }
 //____________________________________________________________________________
 void AliPHOSEmcRecPoint::Print(Option_t *) const