Set NxN settings in Params.

diff --git a/EMCAL/AliEMCALRecParam.cxx b/EMCAL/AliEMCALRecParam.cxx
index fe33c03ed270a30b17c63ff1094b1ddeaf7ccb57..a078e0ad1f9e9d580fc8f800a0f214433a0e17aa 100644 (file)
--- a/EMCAL/AliEMCALRecParam.cxx
+++ b/EMCAL/AliEMCALRecParam.cxx
@@ -47,6 +47,8 @@ AliEMCALRecParam::AliEMCALRecParam() :
   fTimeMin(-1.),// small value, accept all
   fTimeMax(1.),// high value, accept all//clustering
   fClusterizerFlag(AliEMCALRecParam::kClusterizerv1),
+  fNRowDiff(1),
+  fNColDiff(1),
   fMthCutEta(0.025), 
   fMthCutPhi(0.05),
   fStep(50),
@@ -248,6 +250,8 @@ AliEMCALRecParam::AliEMCALRecParam(const AliEMCALRecParam& rp) :
   fTimeMin(rp.fTimeMin),
   fTimeMax(rp.fTimeMax),//clustering
   fClusterizerFlag(rp.fClusterizerFlag),
+  fNRowDiff(rp.fNRowDiff),
+  fNColDiff(rp.fNColDiff),
   fMthCutEta(rp.fMthCutEta), 
   fMthCutPhi(rp.fMthCutPhi),
   fStep(rp.fStep),
@@ -308,6 +312,8 @@ AliEMCALRecParam& AliEMCALRecParam::operator = (const AliEMCALRecParam& rp)
     fTimeMax   = rp.fTimeMax;
     fTimeMin   = rp.fTimeMin;//clustering
     fClusterizerFlag   = rp.fClusterizerFlag;
+    fNRowDiff  = rp.fNRowDiff;
+    fNColDiff  = rp.fNColDiff;
     fMthCutEta         = rp.fMthCutEta;
     fMthCutPhi         = rp.fMthCutPhi;
     fStep              = rp.fStep;

diff --git a/EMCAL/AliEMCALRecParam.h b/EMCAL/AliEMCALRecParam.h
index fb9571d4d2109313d2210b9006d3486d7cb48081..ad2fd8faf5277018c8eb1f9e2992db9262e668aa 100644 (file)
--- a/EMCAL/AliEMCALRecParam.h
+++ b/EMCAL/AliEMCALRecParam.h
@@ -28,10 +28,8 @@ class AliEMCALRecParam : public AliDetectorRecoParam
   {
     kClusterizerv1  = 0,
     kClusterizerNxN = 1,
-    kClusterizer3x3 = 1, // consider to remove kClusterizerNxN
     kClusterizerv2  = 2,
-    kClusterizer5x5 = 3,
-    kClusterizerFW  = 4
+    kClusterizerFW  = 3
   };
   
   AliEMCALRecParam() ;
@@ -48,7 +46,9 @@ class AliEMCALRecParam : public AliDetectorRecoParam
   Float_t GetTimeMin            () const     {return fTimeMin             ;}
   Float_t GetTimeMax            () const     {return fTimeMax             ;}
   Bool_t  GetUnfold             () const     {return fUnfold              ;}
-       
+  Int_t   GetNRowDiff           () const     {return fNRowDiff            ;}
+  Int_t   GetNColDiff           () const     {return fNColDiff            ;}
+
   void SetClusteringThreshold(Float_t thrsh)     {fClusteringThreshold = thrsh;}
   void SetW0                 (Float_t w0)        {fW0        = w0         ;}
   void SetMinECut            (Float_t ecut)      {fMinECut   = ecut       ;}
@@ -56,8 +56,9 @@ class AliEMCALRecParam : public AliDetectorRecoParam
   void SetTimeCut            (Float_t t)         {fTimeCut   = t          ;}
   void SetTimeMin            (Float_t t)         {fTimeMin   = t          ;}
   void SetTimeMax            (Float_t t)         {fTimeMax   = t          ;}
-  void SetUnfold             (Bool_t unfold)     {fUnfold = unfold ;}
-  
+  void SetUnfold             (Bool_t unfold)     {fUnfold    = unfold     ;}
+  void SetNxM(Int_t rdiff, Int_t cdiff)          {fNRowDiff=rdiff; fNColDiff = cdiff; }
+
   //PID (Guenole)
   Double_t GetGamma(Int_t i, Int_t j) const       {return fGamma[i][j];} 
   Double_t GetGammaEnergyProb(Int_t i) const      {return fGammaEnergyProb[i];} 
@@ -125,8 +126,7 @@ class AliEMCALRecParam : public AliDetectorRecoParam
   void SetPar5(Int_t i, Double_t param )       {fPar5[i]=param;}
   void SetPar6(Int_t i, Double_t param )       {fPar6[i]=param;}
 
-
-  virtual void Print(Option_t * option="") const ;
+  virtual void Print(Option_t * option="") const;
   
   static AliEMCALRecParam* GetDefaultParameters();
   static AliEMCALRecParam* GetLowFluxParam();
@@ -150,6 +150,8 @@ class AliEMCALRecParam : public AliDetectorRecoParam
   Float_t fTimeMin ;             // Minimum time of digits
   Float_t fTimeMax ;             // Maximum time of digits
   Short_t fClusterizerFlag ;     // Choice of the clusterizer; Default selection (v1) is zero
+  Int_t   fNRowDiff;             // NxN: How many neighbors to consider along row (phi)
+  Int_t   fNColDiff;             // NxN: How many neighbors to consider along col (eta)
 
   //PID (Guenole)
   Double_t fGamma[6][6];         // Parameter to Compute PID for photons     
@@ -188,9 +190,8 @@ class AliEMCALRecParam : public AliDetectorRecoParam
 
   static TObjArray* fgkMaps;       // ALTRO mappings for RCU0..RCUX
   
-  ClassDef(AliEMCALRecParam,15)     // Reconstruction parameters
-    
-    } ;
+  ClassDef(AliEMCALRecParam,16)     // Reconstruction parameters
+};
 
 #endif //  ALIEMCALRECPARAM_H
 

diff --git a/PWG4/CaloCalib/AliAnalysisTaskEMCALClusterizeFast.cxx b/PWG4/CaloCalib/AliAnalysisTaskEMCALClusterizeFast.cxx
index f5a1d1db8c4ecf3bea25b1de6ae8f1d1a3e7e6bd..417291c62a854d071a30bfc943a251c4b50dda02 100644 (file)
--- a/PWG4/CaloCalib/AliAnalysisTaskEMCALClusterizeFast.cxx
+++ b/PWG4/CaloCalib/AliAnalysisTaskEMCALClusterizeFast.cxx
@@ -78,9 +78,9 @@ AliAnalysisTaskEMCALClusterizeFast::AliAnalysisTaskEMCALClusterizeFast()
     fNewClusterArrayName("newCaloClusters"),
     fNPhi(4),
     fNEta(4),
-    fshiftPhi(2),
-    fshiftEta(2),
-    fTRUshift(0),
+    fShiftPhi(2),
+    fShiftEta(2),
+    fTRUShift(0),
     fStoreAdditionalInformation(0)
 { 
   // Constructor
@@ -115,9 +115,9 @@ AliAnalysisTaskEMCALClusterizeFast::AliAnalysisTaskEMCALClusterizeFast(const cha
     fNewClusterArrayName("newCaloClusters"),
     fNPhi(4),
     fNEta(4),
-    fshiftPhi(2),
-    fshiftEta(2),
-    fTRUshift(0),
+    fShiftPhi(2),
+    fShiftEta(2),
+    fTRUShift(0),
     fStoreAdditionalInformation(0)
 { 
   // Constructor
@@ -596,23 +596,20 @@ void AliAnalysisTaskEMCALClusterizeFast::Init()
   delete fClusterizer;
   if     (fRecParam->GetClusterizerFlag() == AliEMCALRecParam::kClusterizerv1)
     fClusterizer = new AliEMCALClusterizerv1(geometry);
-  else if(fRecParam->GetClusterizerFlag() == AliEMCALRecParam::kClusterizerNxN) 
-    fClusterizer = new AliEMCALClusterizerNxN(geometry);
-  else if(fRecParam->GetClusterizerFlag() == AliEMCALRecParam::kClusterizerv2) 
-    fClusterizer = new AliEMCALClusterizerv2(geometry);
-  else if(fRecParam->GetClusterizerFlag() == AliEMCALRecParam::kClusterizer5x5) {
+  else if(fRecParam->GetClusterizerFlag() == AliEMCALRecParam::kClusterizerNxN) {
    AliEMCALClusterizerNxN *clusterizer = new AliEMCALClusterizerNxN(geometry);
-   clusterizer->SetNRowDiff(2);
-   clusterizer->SetNColDiff(2);
-   fClusterizer = clusterizer;
-  } 
+   clusterizer->SetNRowDiff(fRecParam->GetNRowDiff());
+   clusterizer->SetNColDiff(fRecParam->GetNColDiff());
+    fClusterizer = clusterizer;
+  } else if(fRecParam->GetClusterizerFlag() == AliEMCALRecParam::kClusterizerv2) 
+    fClusterizer = new AliEMCALClusterizerv2(geometry);
   else if(fRecParam->GetClusterizerFlag() == AliEMCALRecParam::kClusterizerFW){
     AliEMCALClusterizerFixedWindow *clusterizer = new AliEMCALClusterizerFixedWindow(geometry);
     clusterizer->SetnPhi(fNPhi);
     clusterizer->SetnEta(fNEta);
-    clusterizer->SetshiftPhi(fshiftPhi);
-    clusterizer->SetshiftEta(fshiftEta);
-    clusterizer->SetTRUshift(fTRUshift);
+    clusterizer->SetshiftPhi(fShiftPhi);
+    clusterizer->SetshiftEta(fShiftEta);
+    clusterizer->SetTRUshift(fTRUShift);
     fClusterizer = clusterizer;
   }
   else{

diff --git a/PWG4/CaloCalib/AliAnalysisTaskEMCALClusterizeFast.h b/PWG4/CaloCalib/AliAnalysisTaskEMCALClusterizeFast.h
index feb1c0d5f4e830a100cf4172b039ad76807a7ea9..e46261e3cbd650918b87a3c10d5fd44a8606d1ad 100644 (file)
--- a/PWG4/CaloCalib/AliAnalysisTaskEMCALClusterizeFast.h
+++ b/PWG4/CaloCalib/AliAnalysisTaskEMCALClusterizeFast.h
@@ -51,14 +51,14 @@ class AliAnalysisTaskEMCALClusterizeFast : public AliAnalysisTaskSE {
   void                   SetPedestalData(AliCaloCalibPedestal *d)    { fPedestalData        = d     ; }
   void                   SetRecalibrateCellsOnly(Bool_t b)           { fRecalibOnly         = b     ; }
   void                   SetSubBackground(Bool_t b)                  { fSubBackground       = b     ; }
-  void                   SetCreatePattern(Bool_t yes)                { fCreatePattern       = yes   ; if (yes) fOverwrite = kTRUE;}
-  void                   SetOverwrite(Bool_t yes)                    { fOverwrite           = yes   ; if (fCreatePattern) fOverwrite = kTRUE;}
+  void                   SetCreatePattern(Bool_t yes)                { fCreatePattern       = yes   ; if (yes) fOverwrite = kTRUE; }
+  void                   SetOverwrite(Bool_t yes)                    { fOverwrite           = yes   ; if (yes) fOverwrite = kTRUE; }
   void                   SetNewClusterArrayName(TString name)        { fNewClusterArrayName = name  ; }
   void                   SetnPhi(Int_t n)                            { fNPhi                = n     ; }
   void                   SetnEta(Int_t n)                            { fNEta                = n     ; }        
-  void                   SetshiftPhi(Int_t n)                        { fshiftPhi            = n     ; }
-  void                   SetshiftEta(Int_t n)                        { fshiftEta            = n     ; }
-  void                   SetTRUshift(Bool_t yes)                     { fTRUshift            = yes   ; }
+  void                   SetShiftPhi(Int_t n)                        { fShiftPhi            = n     ; }
+  void                   SetShiftEta(Int_t n)                        { fShiftEta            = n     ; }
+  void                   SetTRUShift(Bool_t yes)                     { fTRUShift            = yes   ; }
   void                   SetStoreAdditionalInformation(Bool_t yes)   { fStoreAdditionalInformation = yes; }
 
  protected:
@@ -97,9 +97,9 @@ class AliAnalysisTaskEMCALClusterizeFast : public AliAnalysisTaskSE {
   TString                fNewClusterArrayName;            // If not overwriting, name of the new cluster array
   Int_t                  fNPhi;                           // nPhi (for FixedWindowsClusterizer)
   Int_t                  fNEta;                           // nEta (for FixedWinoswsClusterizer)
-  Int_t                  fshiftPhi;                       // shiftPhi (for FixedWindowsClusterizer)
-  Int_t                  fshiftEta;                       // shiftEta (for FixedWindowsClusterizer)
-  Bool_t                 fTRUshift;                       // Shifting inside a TRU (true) or through the whole calorimeter (false) (for FixedWindowsClusterizer)
+  Int_t                  fShiftPhi;                       // ShiftPhi (for FixedWindowsClusterizer)
+  Int_t                  fShiftEta;                       // ShiftEta (for FixedWindowsClusterizer)
+  Bool_t                 fTRUShift;                       // Shifting inside a TRU (true) or through the whole calorimeter (false) (for FixedWindowsClusterizer)
   Bool_t                 fStoreAdditionalInformation;     // Store additional information (for FixedWindowsClusterizer)
 
  private: