removed cell_pos

diff --git a/PMD/AliPMDClustering.cxx b/PMD/AliPMDClustering.cxx
index ccee2d8..d3b6d64 100644 (file)
--- a/PMD/AliPMDClustering.cxx
+++ b/PMD/AliPMDClustering.cxx
@@ -59,7 +59,6 @@ AliPMDClustering::~AliPMDClustering()
 
 }
 
-//void AliPMDClustering::DoClust(int idet, int isup, double d1[72][72], AliPMDContainer *pmdc)
 void AliPMDClustering::DoClust(int idet, int isup, double d1[72][72], TObjArray *pmdcont)
 {
 
@@ -679,144 +678,6 @@ double AliPMDClustering::ranmar()
 
 }   
 
-void AliPMDClustering::ConvertL2G(int smnumber, double xcell, double ycell, double &xpos, double &ypos)
-{
-  float xreal = -999., yreal = -999.;
-  float cell_rad=0.25, celldia_x=0.5, celldia_y=0.4330127;
-  float xcon, ycon;
-  float xoff1, xoff2, yoff=0.2886751, yoff3;
-  float xhex1 = -27.09375, yhex1 = -15.652584;
-  float xhex2 =  27.09375, yhex2 = -15.652584;
-  float xhex3 = 0.0, yhex3 = 31.285168;
-
-
-  double xcorner[27] =
-  {
-    9.435395, 45.560394,  81.685394, -8.627106,
-    27.497894, 63.622894, -26.689606,  9.435394,
-    45.560394, 9.435344,  -8.627106, -26.689556,
-    45.560345, 27.497894, 9.435445,   81.685341,
-    63.622894, 45.560444, -18.870789, -36.933388,
-    -54.995991, -36.933189, -54.995789, -73.058388,
-    -54.995586, -73.058189, -91.120789
-  };
-  
-  double ycorner[27] = 
-  {
-    -16.342583, -16.34258, -16.34258, -47.627750, -47.627750,
-    -47.627750, -78.912918, -78.912918, -78.912918, 16.342611,
-    47.627808, 78.913002, 16.342554, 47.627750, 78.912949,
-    16.342495, 47.627693, 78.912888, -0.000116, -31.285227,
-    -62.570335, 31.285110, 0.000000, -31.285110, 62.570335,
-    31.285227, 0.000116
-  };
- 
-  if (smnumber<=8)
-    {
-      xcon  = xcorner[smnumber]+xhex1;
-      ycon  = ycorner[smnumber]+yhex1;
-      xoff1 = celldia_x+(ycell-1)*cell_rad;
-      xreal = xcon+xoff1+celldia_x*(xcell-1);
-      yreal = ycon+yoff+celldia_y*(ycell-1);
-    }
-
-  if (smnumber>8 && smnumber<=17)
-    {
-      xcon  = xcorner[smnumber]+xhex2;
-      ycon  = ycorner[smnumber]+yhex2;
-      xoff2 = celldia_x+(xcell-1)*cell_rad;
-      xreal = xcon-(xoff2+celldia_x*(ycell-1));
-      yreal = ycon+yoff+celldia_y*(xcell-1);
-    }          
-    
-  if (smnumber>17)
-    {
-      xcon  = xcorner[smnumber]+xhex3;
-      ycon  = ycorner[smnumber]+yhex3;
-      yoff3 = celldia_x * 0.8660254  + cell_rad * 0.57735027;
-      xreal = xcon+(ycell-xcell)*cell_rad;
-      yreal = ycon-(yoff3+(xcell+ycell-2)*celldia_y);
-    }
-
-  xpos = xreal;
-  ypos = yreal;
-}
-
-void AliPMDClustering::cell_pos(Int_t isup, Int_t j, int k, Float_t &xp, Float_t &yp){
-
-  /*
-    This converts PMD cluster or CELL coordinates
-    to Global coordinates.
-    Written by Prof. S.C. Phatak
-  */
-
-  Int_t i;
-  Float_t celldia = 0.5;
-  const Float_t pi = 3.14159;
-  const double sqrth=0.8660254;  // sqrth = sqrt(3.)/2.
-  /*
-    isup --> supermodule no ( 0 - 26 )
-    idet --> detector ( pmd or cpv : not required now )
-    j --> xpad ( goes from 1 to 72 )
-    k --> ypad ( goes from 1 to 72 )
-    xp --> global x coordinate
-    yp --> global y coordinate
-    
-    (xp0,yp0) corner positions of all supermodules in global
-    coordinate system. That is the origin
-    of the local ( supermodule ) coordinate system.
-*/ 
-  
-  Float_t xp0[27] = 
-  {
-    -17.9084, 18.2166, 54.3416, -35.9709, 0.154144, 
-    36.2791, -54.0334, -17.9084, 18.2166, 36.7791, 
-    18.7166, 0.654194, 72.9041, 54.8416, 36.7792, 
-    109.029, 90.9666, 72.9042, -18.8708, -36.9334, 
-    -54.996, -36.9332, -54.9958, -73.0584, -54.9956, 
-    -73.0582, -91.1208
-  };
-
-  Float_t yp0[27] = 
-  {
-    -32.1395, -32.1395, -32.1395, -63.4247, -63.4247, 
-    -63.4247, -94.7098, -94.7098, -94.7098, 0.545689, 
-    31.8309, 63.1161, 0.545632, 31.8308, 63.116, 
-    0.545573, 31.8308, 63.116, 31.5737, 0.288616, 
-    -30.9965, 62.859, 31.5738, 0.288733, 94.1442, 
-    62.8591, 31.574
-  };
-
-  /* 
-     angles of rotation for three sets of supermodules
-     The angle is same for first nine, next nine and last nine 
-     supermodules 
-  */
-  
-  Float_t th[3] = {0., -2.*pi/3., 2.*pi/3.};
-  Float_t xr, yr, xinit, yinit, cs, sn;
-  
-  /* 
-     xinit and yinit are coordinates of the cell in local coordinate system
-  */
-  
-  xinit = (j)*celldia+(k)/2.*celldia;
-  yinit = sqrth*(k)/2.;
-  i=isup/9;
-  cs=cos(th[i]);
-  sn=sin(th[i]);
-  //
-  // rotate first
-  //
-  xr=cs*xinit+sn*yinit;
-  yr=-sn*xinit+cs*yinit;
-  //
-  // then translate
-  //
-  xp=xr+xp0[isup];
-  yp=yr+yp0[isup];
-
-}
 void AliPMDClustering::SetMessage(Int_t imessage)
 {
   fMessage = imessage;

diff --git a/PMD/AliPMDClustering.h b/PMD/AliPMDClustering.h
index e753266..5890102 100644 (file)
--- a/PMD/AliPMDClustering.h
+++ b/PMD/AliPMDClustering.h
@@ -103,8 +103,6 @@ class AliPMDClustering
   double Dist(double, double, double, double);
   void gaussfit(int, int, double &, double &, double &, double &, double &, 
                double &, double &);
-  void ConvertL2G(int, double, double, double &, double &);
-  void cell_pos(Int_t , Int_t , Int_t , Float_t &, Float_t &);
   void SetMessage(Int_t);
 
   ClassDef(AliPMDClustering,1)