lcsim/src/org/lcsim/digisim

diff -u -r1.7 -r1.8
--- CellSelector.java	12 Jul 2005 19:11:47 -0000	1.7
+++ CellSelector.java	18 Jul 2005 18:08:15 -0000	1.8
@@ -22,7 +22,7 @@

  * any cell in a given subdetector.
  *
  * @author Guilherme Lima

- * @version $Id: CellSelector.java,v 1.7 2005/07/12 19:11:47 jeremy Exp $

+ * @version $Id: CellSelector.java,v 1.8 2005/07/18 18:08:15 jeremy Exp $

  */
 public class CellSelector
 {

@@ -53,10 +53,10 @@

 	if(_debug) {
 	    System.out.println("_calsub="+_calsub.getName()
   			   +": a CylindricalCalorimeter, zMax="+cal.getZMax()

-  			   +", nlayers="+cal.getLayerCount());

+  			   +", nlayers="+cal.getLayering().getLayerCount());

 	}
 

-	_nlayers = cal.getLayerCount();

+	_nlayers = cal.getLayering().getLayerCount();

 	_maxTransvBins = new int[_nlayers];
 	_maxLongitBins = new int[_nlayers];
 	_minLongitBins = new int[_nlayers];

@@ -165,7 +165,7 @@

 
       _numCells = 0;
       for(int i=0; i<_nlayers; ++i) {

-	double radius = cal.getDistanceToLayerSensorMid(i);

+	double radius = cal.getLayering().getDistanceToLayerSensorMid(i);

 	double thetamin = Math.atan( radius/zmax );
 	double thetamax = Math.atan( radius/zmin ) + Math.PI;
 

@@ -195,7 +195,7 @@

  	_minLongitBins[i] = (int)Math.floor(-numz/2);
  	_maxLongitBins[i] = (int)Math.floor((numz-1)/2);
 

-	double radius = cal.getDistanceToLayerSensorMid(i);

+	double radius = cal.getLayering().getDistanceToLayerSensorMid(i);

 	double delphi = nonproj.computeDeltaPhiForLayer(i);
  	_maxTransvBins[i] = (int)Math.floor(2*Math.PI / delphi) - 1;
 	int numphi = _maxTransvBins[i]+1;