Print

Print


Commit in GeomConverter/src/org/lcsim/detector/tracker/silicon on MAIN
SiPixels.java+1-101.2 -> 1.3
Fix bug in computeElectrodeData method

GeomConverter/src/org/lcsim/detector/tracker/silicon
SiPixels.java 1.2 -> 1.3
diff -u -r1.2 -r1.3
--- SiPixels.java	20 Apr 2009 21:28:45 -0000	1.2
+++ SiPixels.java	22 Apr 2009 22:27:42 -0000	1.3
@@ -54,7 +54,6 @@
 //        System.out.println("                        normal: "+((SiSensor)detector).getBiasSurface(carrier).getNormal());
 //        System.out.println("                        distance: "+((SiSensor)detector).getBiasSurface(carrier).getDistance());
 
-        System.out.println("Pixel instantiated with pitch: "+row_pitch+" "+col_pitch);
         setCarrier(carrier);
         setRowPitch(row_pitch);
         setColumnPitch(col_pitch);
@@ -241,7 +240,6 @@
      */
     public SortedMap<Integer, Integer> computeElectrodeData(ChargeDistribution distribution) {
 
-        System.out.println("computeElectrodeData called");
         //  Check to make sure we have a 2D charge distribution
         if (!(distribution instanceof GaussianDistribution2D))
             throw new RuntimeException("Electrode charge distribution not recognized");
@@ -267,7 +265,6 @@
         double ysig = gdistribution.sigma1D(yaxis);
         double rho = gdistribution.covxy(xaxis, yaxis) / (xsig * ysig);
 
-        System.out.println("Mean x: "+x0+" y: "+y0+" sigx: "+xsig+" sigy: "+ysig+" rho: "+rho);
         //  Get the x and y pitches
         double xpitch = getPitch(0);
         double ypitch = getPitch(1);
@@ -290,7 +287,7 @@
         //  Establish the x, y binning
         Hep3Vector corner1 = getCellPosition(cell1);
         double xmin = corner1.x() - 0.5 * xpitch;
-        double ymin = corner1.x() - 0.5 * ypitch;
+        double ymin = corner1.y() - 0.5 * ypitch;
         int nxbins = ixmax - ixmin + 1;
         int nybins = iymax - iymin + 1;
         bivariate.xBins(nxbins, xmin, xpitch);
@@ -359,12 +356,6 @@
             ymax = Math.max(ymax, vertex.y());
         }
 
-//        System.out.println("xmin: " + xmin);
-//        System.out.println("xmax: " + xmax);
-//
-//
-//        System.out.println("# strips: " +   (int)Math.ceil((xmax-xmin)/getPitch(0)) ) ;
-
         setNRows((int) Math.ceil((xmax - xmin) / getPitch(0)));
         setNColumns((int) Math.ceil((ymax - ymin) / getPitch(1)));
 
CVSspam 0.2.8