AliRICHMap corrected for a new AliRICHdigit

diff --git a/RICH/AliRICHClusterFinder.cxx b/RICH/AliRICHClusterFinder.cxx
index e39c150924fb68661690cd6fbbed1f215130db98..d0f0fdacbdee49d4111a0176c485786f300cbb86 100644 (file)
--- a/RICH/AliRICHClusterFinder.cxx
+++ b/RICH/AliRICHClusterFinder.cxx
@@ -94,17 +94,16 @@ void AliRICHClusterFinder::Exec()
 //__________________________________________________________________________________________________
 void AliRICHClusterFinder::FindRawClusters(Int_t iChamber)
 {//finds neighbours and fill the tree with raw clusters
-  Info("FindRawClusters","Start for Chamber %i.",iChamber);
-  
   Int_t nDigits=Rich()->Digits(iChamber)->GetEntriesFast();
+  Info("FindRawClusters","Start for Chamber %i with %i digits.",iChamber,nDigits);  
   if(nDigits==0)return;
 
   fHitMap=new AliRICHMap(Rich()->Digits(iChamber));
 
   AliRICHcluster *pRawCluster;
-  
+    
   for(Int_t iDig=0;iDig<nDigits;iDig++){    
-    AliRICHdigit *dig=(AliRICHdigit*)Rich()->Digits(iChamber)->UncheckedAt(iDig);
+    AliRICHdigit *dig=(AliRICHdigit*)Rich()->Digits(iChamber)->At(iDig);
     Int_t i=dig->X();   Int_t j=dig->Y();
     if(fHitMap->TestHit(i,j)==kUsed) continue;
        

diff --git a/RICH/AliRICHMap.cxx b/RICH/AliRICHMap.cxx
index a71e69938e2de3b1b381df19092314e91c2c24af..d45322c08f1d0c50c6e6f5ad78c7b0501f39ffeb 100644 (file)
--- a/RICH/AliRICHMap.cxx
+++ b/RICH/AliRICHMap.cxx
@@ -14,8 +14,7 @@
  **************************************************************************/
 
 #include "AliRICHMap.h"
-#include "AliRICHParam.h"
-#include "AliRICHDigit.h"
+#include "AliRICH.h"
 
 ClassImp(AliRICHMap)
 
@@ -32,8 +31,8 @@ void  AliRICHMap::FillHits()
 {//Fill hits into HitMap
   if(!fNdigits) return;    
   for(Int_t iDigN=0;iDigN<fNdigits;iDigN++){
-    AliRICHDigit *pDig= (AliRICHDigit*)fDigits->At(iDigN);
-    SetHit(pDig->PadX(),pDig->PadY(),iDigN);
+    AliRICHdigit *pDig= (AliRICHdigit*)fDigits->At(iDigN);
+    SetHit(pDig->X(),pDig->Y(),iDigN);
   }
 }
 //__________________________________________________________________________________________________

diff --git a/RICH/AliRICHParam.cxx b/RICH/AliRICHParam.cxx
index 9aa23f031b98a93579e2b7fc7823b64b18a82ac2..d29e61e52c3ab7c2bf815c1cd5dbddd03ae16ccf 100644 (file)
--- a/RICH/AliRICHParam.cxx
+++ b/RICH/AliRICHParam.cxx
@@ -14,8 +14,9 @@
  **************************************************************************/
 #include "AliRICHParam.h"
 
-Bool_t   AliRICHParam::fgIsWireSag    =kTRUE;
-Double_t AliRICHParam::fgAngleRot     =-60;
-Int_t    AliRICHParam::fgHV           =2150;
+Bool_t   AliRICHParam::fgIsWireSag            =kTRUE;
+Bool_t   AliRICHParam::fgIsResolveClusters    =kFALSE;
+Double_t AliRICHParam::fgAngleRot             =-60;
+Int_t    AliRICHParam::fgHV                   =2150;
 
 ClassImp(AliRICHParam)

diff --git a/RICH/AliRICHParam.h b/RICH/AliRICHParam.h
index 89908afca93a280ecf039e081b04aa71f4cf40d8..665b4436b10644f049b9aa4f434e886acb1d1f04 100644 (file)
--- a/RICH/AliRICHParam.h
+++ b/RICH/AliRICHParam.h
@@ -49,12 +49,14 @@ public:
   static Double_t QdcSlope(Int_t sec)        {HV(sec);return 27;}
   static Double_t AlphaFeedback(Int_t sec)   {HV(sec);return 0.036;}
   
+  static Bool_t  IsResolveClusters()         {return fgIsResolveClusters;}  
   static Bool_t   IsWireSag()                {return fgIsWireSag;}
   static Int_t    HV(Int_t)                  {return fgHV;}
-  static Double_t AngleRot()                {return fgAngleRot*TMath::DegToRad();} 
-    static void  SetWireSag(Bool_t status)  {fgIsWireSag=status;}  
-    static void  SetHV(Int_t hv)            {fgHV       =hv;}  
-    static void  SetAngleRot(Double_t rot)  {fgAngleRot =rot;}         
+  static Double_t AngleRot()                 {return fgAngleRot*TMath::DegToRad();} 
+    static void  SetResolveClusters(Bool_t a){fgIsResolveClusters=a;}  
+    static void  SetWireSag(Bool_t status)   {fgIsWireSag=status;}  
+    static void  SetHV(Int_t hv)             {fgHV       =hv;}  
+    static void  SetAngleRot(Double_t rot)   {fgAngleRot =rot;}         
 
   inline static Double_t Mathienson(Double_t lx1,Double_t lx2,Double_t ly1,Double_t ly2);   
   inline static void    Loc2Area(TVector3 hitX3,Int_t &padxMin,Int_t &padyMin,Int_t &padxMax,Int_t &padyMax);
@@ -69,11 +71,12 @@ public:
          Bool_t SigGenCond(Double_t,Double_t){return kFALSE;}
   inline static Int_t   Loc2Sec(Double_t &x,Double_t &y); 
   inline static Int_t   Pad2Sec(Int_t &padx,Int_t &pady); 
-  inline static Bool_t  IsResolveClusters() {return kTRUE;}  
+  
 protected:
-  static Bool_t  fgIsWireSag;      //is wire sagitta taken into account
-  static Int_t   fgHV;             //HV applied to anod wires
-  static Double_t fgAngleRot;       //rotation of RICH from up postion (0,0,490)cm
+  static Bool_t  fgIsWireSag;              //is wire sagitta taken into account
+  static Bool_t  fgIsResolveClusters;      //performs declustering or not
+  static Int_t   fgHV;                     //HV applied to anod wires
+  static Double_t fgAngleRot;              //rotation of RICH from up postion (0,0,490)cm
   
   ClassDef(AliRICHParam,4)    //RICH main parameters
 };