clustering parameter is set to decide the clustering algo
authorbasanta <basanta@f7af4fe6-9843-0410-8265-dc069ae4e863>
Thu, 14 Jan 2010 10:40:18 +0000 (10:40 +0000)
committerbasanta <basanta@f7af4fe6-9843-0410-8265-dc069ae4e863>
Thu, 14 Jan 2010 10:40:18 +0000 (10:40 +0000)
PMD/AliPMDClusterFinder.cxx
PMD/AliPMDClustering.h
PMD/AliPMDClusteringV1.cxx
PMD/AliPMDClusteringV1.h
PMD/AliPMDClusteringV2.cxx
PMD/AliPMDClusteringV2.h

index 0af1a5f3e86f1e257dfe33615a46085a6e34d6b0..0b02d321a7d57ae4939b5d386e4154b0514e0e64 100644 (file)
@@ -264,9 +264,10 @@ void AliPMDClusterFinder::Digits2RecPoints(TTree *digitsTree,
 
 
       // Int_t cluspar = fRecoParam->GetPbPbParam()->GetClusteringParam();
-      //Int_t cluspar = fRecoParam->GetPPParam()->GetClusteringParam();
+      Int_t cluspar = fRecoParam->GetPPParam()->GetClusteringParam();
       // Int_t cluspar = fRecoParam->GetCosmicParam()->GetClusteringParam();
 
+      pmdclust->SetClusteringParam(cluspar);
 
       Float_t encut = 0.;
       pmdclust->SetEdepCut(encut);
@@ -588,9 +589,9 @@ void AliPMDClusterFinder::Digits2RecPoints(AliRawReader *rawReader,
          Int_t imod = idet*24 + ismn;
 
          // Int_t cluspar = fRecoParam->GetPbPbParam()->GetClusteringParam();
-         // Int_t cluspar = fRecoParam->GetPPParam()->GetClusteringParam();
+         Int_t cluspar = fRecoParam->GetPPParam()->GetClusteringParam();
          // Int_t cluspar = fRecoParam->GetCosmicParam()->GetClusteringParam();
-         
+         pmdclust->SetClusteringParam(cluspar);
          Float_t encut = fNoiseCut->GetNoiseCut(imod);
 
          pmdclust->SetEdepCut(encut);
index 65512e45b5068d44b50af93b6fdcda34eeaffa47..a17dd87996c1318931e07fe0dd2b19b4f445e296 100644 (file)
@@ -28,7 +28,8 @@ class AliPMDClustering: public TObject
                       TObjArray *pmdcont) = 0;
 
   virtual void SetEdepCut(Float_t decut) = 0;
+  virtual void SetClusteringParam(Int_t cluspar) = 0;
 
-  ClassDef(AliPMDClustering,8) // Does clustering for PMD
+  ClassDef(AliPMDClustering,9) // Does clustering for PMD
 };
 #endif
index 3bbb12db3cb2fbeedd4208b6169e83b41cf4a498..e399286285352179c7756333f7eec9e9c693a17e 100644 (file)
@@ -61,7 +61,8 @@ const Double_t AliPMDClusteringV1::fgkSqroot3by2=0.8660254;  // sqrt(3.)/2.
 
 AliPMDClusteringV1::AliPMDClusteringV1():
   fPMDclucont(new TObjArray()),
-  fCutoff(0.0)
+  fCutoff(0.0),
+  fClusParam(0)
 {
   for(Int_t i = 0; i < kNDIMX; i++)
     {
@@ -76,7 +77,8 @@ AliPMDClusteringV1::AliPMDClusteringV1():
 AliPMDClusteringV1::AliPMDClusteringV1(const AliPMDClusteringV1& pmdclv1):
   AliPMDClustering(pmdclv1),
   fPMDclucont(0),
-  fCutoff(0)
+  fCutoff(0),
+  fClusParam(0)
 {
   // copy constructor
   AliError("Copy constructor not allowed ");
@@ -939,3 +941,8 @@ void AliPMDClusteringV1::SetEdepCut(Float_t decut)
   fCutoff = decut;
 }
 // ------------------------------------------------------------------------ //
+void AliPMDClusteringV1::SetClusteringParam(Int_t cluspar)
+{
+  fClusParam = cluspar;
+}
+// ------------------------------------------------------------------------ //
index ca705c0f6d92739a44f0e7897b8508fdd52407c0..4aef8c6b526badab2c9e091ec463ff1cdfe29dbf 100644 (file)
@@ -43,6 +43,8 @@ class AliPMDClusteringV1: public AliPMDClustering
                    Double_t x2, Double_t y2);
 
   void     SetEdepCut(Float_t decut);
+  void     SetClusteringParam(Int_t cluspar);
+
   
  protected:
   
@@ -63,8 +65,9 @@ class AliPMDClusteringV1: public AliPMDClustering
                                        // -- cluster number
   Double_t fCoord[2][kNDIMX][kNDIMY];
 
-  Float_t  fCutoff; // Energy(ADC) cutoff per cell before clustering
+  Float_t  fCutoff;    // Energy(ADC) cutoff per cell before clustering
+  Int_t    fClusParam; // Parameter to decide the clustering
 
-  ClassDef(AliPMDClusteringV1,8) // Does clustering for PMD
+  ClassDef(AliPMDClusteringV1,9) // Does clustering for PMD
 };
 #endif
index dab9faceba7422356078e7b1095b1eeb2ead6886..9a7622ecd7c4e57a443db04c78240bab8d1eed9c 100644 (file)
@@ -54,7 +54,8 @@ const Double_t AliPMDClusteringV2::fgkSqroot3by2=0.8660254;  // sqrt(3.)/2.
 
 AliPMDClusteringV2::AliPMDClusteringV2():
   fPMDclucont(new TObjArray()),
-  fCutoff(0.0)
+  fCutoff(0.0),
+  fClusParam(0)
 {
   for(int i = 0; i < kNDIMX; i++)
     {
@@ -71,7 +72,8 @@ AliPMDClusteringV2::AliPMDClusteringV2():
 AliPMDClusteringV2::AliPMDClusteringV2(const AliPMDClusteringV2& pmdclv2):
   AliPMDClustering(pmdclv2),
   fPMDclucont(0),
-  fCutoff(0)
+  fCutoff(0),
+  fClusParam(0)
 {
   // copy constructor
   AliError("Copy constructor not allowed ");
@@ -1067,3 +1069,8 @@ void AliPMDClusteringV2::SetEdepCut(Float_t decut)
   fCutoff = decut;
 }
 // ------------------------------------------------------------------------ //
+void AliPMDClusteringV2::SetClusteringParam(Int_t cluspar)
+{
+  fClusParam = cluspar;
+}
+// ------------------------------------------------------------------------ //
index 995440dd34900683bb8e261c3c0023ec8ceb9a1b..a943ccc080801121f30f8e1a94391150fbb4a910 100644 (file)
@@ -43,6 +43,7 @@ class AliPMDClusteringV2 : public AliPMDClustering
   Double_t Distance(Double_t x1, Double_t y1, Double_t x2, Double_t y2);
 
   void     SetEdepCut(Float_t decut);
+  void     SetClusteringParam(Int_t cluspar);
   
  protected:
   
@@ -60,9 +61,10 @@ class AliPMDClusteringV2 : public AliPMDClustering
                                        // -- cluster number
   Double_t fCoord[2][kNDIMX][kNDIMY];
 
-  Float_t fCutoff; // Energy(ADC) cutoff per cell before clustering
+  Float_t fCutoff;    // Energy(ADC) cutoff per cell before clustering
+  Float_t fClusParam; // paramater to decide clustering
   
-  ClassDef(AliPMDClusteringV2,7) // Does clustering for PMD
+  ClassDef(AliPMDClusteringV2,8) // Does clustering for PMD
 };
 #endif