X-Git-Url: http://git.uio.no/git/?a=blobdiff_plain;f=PMD%2FAliPMDClusteringV2.cxx;h=dbbb09cc9a577ef1a5eefedff1893cc44a972a6e;hb=7adbd8e9efb7f34bb8e4e30a63b6fda2c8a90e30;hp=fb0835123665847b368a95445ff501f40634b212;hpb=2c1131ddd31f4412dbddda47ec264529029e081a;p=u%2Fmrichter%2FAliRoot.git

diff --git a/PMD/AliPMDClusteringV2.cxx b/PMD/AliPMDClusteringV2.cxx
index fb083512366..dbbb09cc9a5 100644
--- a/PMD/AliPMDClusteringV2.cxx
+++ b/PMD/AliPMDClusteringV2.cxx
@@ -44,6 +44,7 @@
 
 #include "AliPMDcludata.h"
 #include "AliPMDcluster.h"
+#include "AliPMDisocell.h"
 #include "AliPMDClustering.h"
 #include "AliPMDClusteringV2.h"
 #include "AliLog.h"
@@ -92,7 +93,10 @@ AliPMDClusteringV2::~AliPMDClusteringV2()
 // ------------------------------------------------------------------------ //
 
 void AliPMDClusteringV2::DoClust(Int_t idet, Int_t ismn, 
-				 Double_t celladc[48][96], TObjArray *pmdcont)
+				 Int_t celltrack[48][96],
+				 Int_t cellpid[48][96],
+				 Double_t celladc[48][96],
+				 TObjArray *pmdisocell, TObjArray *pmdcont)
 {
   // main function to call other necessary functions to do clustering
   //
@@ -104,11 +108,19 @@ void AliPMDClusteringV2::DoClust(Int_t idet, Int_t ismn,
   Int_t    ndimXr = 0;
   Int_t    ndimYr = 0;
   Int_t    celldataX[kNmaxCell], celldataY[kNmaxCell];
+  Int_t    celldataTr[kNmaxCell], celldataPid[kNmaxCell];
+  Float_t  celldataAdc[kNmaxCell];
   Float_t  clusdata[6];  
   Double_t cutoff, ave;
   Double_t edepcell[kNMX];
 
 
+  // call the isolated cell search method
+
+  CalculateIsoCell(idet, ismn, celladc, pmdisocell);
+
+
+
   if (ismn < 12)
     {
       ndimXr = 96;
@@ -233,10 +245,28 @@ void AliPMDClusteringV2::DoClust(Int_t idet, Int_t ismn,
 	    {
 	      celldataX[ihit] = (Int_t) ((cellX - (48-1) + cellY/2.) + 0.5 );
 	    }	  
-	  celldataY[ihit] = (Int_t) (cellY + 0.5);
+	  celldataY[ihit]   = (Int_t) (cellY + 0.5);
+
+	  Int_t irow = celldataX[ihit];
+	  Int_t icol = celldataY[ihit];
+
+	  if ((irow >= 0 && irow < 48) && (icol >= 0 && icol < 96))
+	    {
+	      celldataTr[ihit]  = celltrack[irow][icol];
+	      celldataPid[ihit] = cellpid[irow][icol];
+	      celldataAdc[ihit] = (Float_t) celladc[irow][icol];
+	    }
+	  else
+	    {
+	      celldataTr[ihit]  = -1;
+	      celldataPid[ihit] = -1;
+	      celldataAdc[ihit] = -1;
+	    }
+
 	}
 
-      pmdcl = new AliPMDcluster(idet, ismn, clusdata, celldataX, celldataY);
+      pmdcl = new AliPMDcluster(idet, ismn, clusdata, celldataX, celldataY,
+				celldataTr, celldataPid, celldataAdc);
       pmdcont->Add(pmdcl);
     }
   fPMDclucont->Delete();
@@ -1037,6 +1067,54 @@ Double_t AliPMDClusteringV2::Distance(Double_t x1, Double_t y1,
 				      Double_t x2, Double_t y2)
 {
   return TMath::Sqrt((x1-x2)*(x1-x2) + (y1-y2)*(y1-y2));
+}
+// ------------------------------------------------------------------------ //
+void AliPMDClusteringV2::CalculateIsoCell(Int_t idet, Int_t ismn, Double_t celladc[][96], TObjArray *pmdisocell)
+{
+  // Does isolated cell search for offline calibration
+
+  AliPMDisocell *isocell = 0;
+
+  const Int_t kMaxRow = 48;
+  const Int_t kMaxCol = 96;
+  const Int_t kCellNeighbour = 6;
+
+  Int_t id1, jd1;
+
+  Int_t neibx[6] = {1,0,-1,-1,0,1};
+  Int_t neiby[6] = {0,1,1,0,-1,-1};
+
+
+  for(Int_t irow = 0; irow < kMaxRow; irow++)
+    {
+      for(Int_t icol = 0; icol < kMaxCol; icol++)
+	{
+	  if(celladc[irow][icol] > 0)
+	    {
+	      Int_t isocount = 0;
+	      for(Int_t ii = 0; ii < kCellNeighbour; ii++)
+		{
+		  id1 = irow + neibx[ii];
+		  jd1 = icol + neiby[ii];
+		  Float_t adc = (Float_t) celladc[id1][jd1];
+		  if(adc == 0.)
+		    {
+		      isocount++;
+		      if(isocount == kCellNeighbour)
+			{
+			  Float_t cadc = (Float_t) celladc[irow][icol];
+
+			  isocell = new AliPMDisocell(idet,ismn,irow,icol,cadc);
+			  pmdisocell->Add(isocell);
+			  
+			}
+		    }
+		}  // neigh cell cond.
+	    }
+	}
+    }
+
+
 }
 // ------------------------------------------------------------------------ //
 void AliPMDClusteringV2::SetEdepCut(Float_t decut)