GeomConverter/src/org/lcsim/geometry/segmentation
diff -u -r1.8 -r1.9
--- SegmentationBase.java 7 Dec 2005 10:39:37 -0000 1.8
+++ SegmentationBase.java 7 Feb 2006 17:11:25 -0000 1.9
@@ -1,7 +1,5 @@
/*
- * Segmentation.java
- *
- * Created on June 1, 2005, 2:05 PM
+ * Segmentation.java Created on June 1, 2005, 2:05 PM
*/
package org.lcsim.geometry.segmentation;
@@ -13,12 +11,10 @@
import hep.physics.vec.Hep3Vector;
/**
- * @author jeremym
- *
- * Base implementation of segmentation
- *
+ * @author jeremym Base implementation of Segmentation.
*/
-public abstract class SegmentationBase extends org.lcsim.geometry.compact.Segmentation
+public abstract class SegmentationBase
+extends org.lcsim.geometry.compact.Segmentation
{
public SegmentationBase(Element e)
{
@@ -27,47 +23,51 @@
/**
* FIXME: Should be renamed as it is actually returning the distance to the
- * midpoint of the sensitive layer.
- *
- * FIXME: Does this belong here? It is only used by CylindricalEndcapCalorimeter.
+ * midpoint of the sensitive layer.
+ * FIXME: Does this belong here? It is only used by CylindricalEndcapCalorimeter.
*/
public double getDistanceToSensitive(int layer)
{
- return ((Layered)detector).getLayering().getDistanceToLayerSensorMid(layer);
+ return ((Layered) detector).getLayering().getDistanceToLayerSensorMid(layer);
}
/**
* Returns the cell which contains a given point (x,y,z).
- *
- * @param x,y,z cartesian coordinates of the point
- * @return ID of cell containing the point (maybe either in
- * absorber or live material), or <em>zero</em> if the point is
- * not inside this component.
+ *
+ * @param x,y,z
+ * cartesian coordinates of the point
+ * @return ID of cell containing the point (maybe either in absorber or live
+ * material), or <em>zero</em> if the point is not inside this
+ * component.
*/
abstract public long findCellContainingXYZ(double x, double y, double z);
/**
* Returns the cell which contains a given point (x,y,z).
- *
- * @param pos 3-dim array with cartesian coordinates of the point
- * @return ID of cell containing the point (maybe either in
- * absorber or live material), or <em>zero</em> if the point is
- * not inside this component.
+ *
+ * @param pos
+ * 3-dim array with cartesian coordinates of the point
+ * @return ID of cell containing the point (maybe either in absorber or live
+ * material), or <em>zero</em> if the point is not inside this
+ * component.
*/
- public long findCellContainingXYZ(double[] pos) {
- return findCellContainingXYZ( pos[0], pos[1], pos[2] );
+ public long findCellContainingXYZ(double[] pos)
+ {
+ return findCellContainingXYZ(pos[0], pos[1], pos[2]);
}
/**
* Returns the cell which contains a given point (x,y,z).
- *
- * @param pos Hep3Vector with cartesian coordinates of the point
- * @return ID of cell containing the point (maybe either in
- * absorber or live material), or <em>zero</em> if the point is
- * not inside this component.
+ *
+ * @param pos
+ * Hep3Vector with cartesian coordinates of the point
+ * @return ID of cell containing the point (maybe either in absorber or live
+ * material), or <em>zero</em> if the point is not inside this
+ * component.
*/
- public long findCellContainingXYZ(Hep3Vector pos) {
- return findCellContainingXYZ( pos.x(), pos.y(), pos.z() );
+ public long findCellContainingXYZ(Hep3Vector pos)
+ {
+ return findCellContainingXYZ(pos.x(), pos.y(), pos.z());
}
/*
@@ -75,7 +75,7 @@
*/
protected int getNumberOfLayers()
{
- return ((Layered)detector).getLayering().getLayerCount();
+ return ((Layered) detector).getLayering().getLayerCount();
}
protected double[] transformLocalToGlobal(double[] localPos)
@@ -85,7 +85,7 @@
protected Layering getLayering()
{
- return ((Layered)detector).getLayering();
+ return ((Layered) detector).getLayering();
}
// Not for public use, this is needed to calculate positions
@@ -93,19 +93,23 @@
/*
* FIXME: Are these next four functions really needed? --JM
*/
- protected double getZMin() {
- return ((CylindricalSubdetector)detector).getZMin();
+ protected double getZMin()
+ {
+ return ((CylindricalSubdetector) detector).getZMin();
}
- protected double getZMax() {
- return ((CylindricalSubdetector)detector).getZMax();
+ protected double getZMax()
+ {
+ return ((CylindricalSubdetector) detector).getZMax();
}
- protected double getRMin() {
- return ((CylindricalSubdetector)detector).getInnerRadius();
+ protected double getRMin()
+ {
+ return ((CylindricalSubdetector) detector).getInnerRadius();
}
- protected double getRMax() {
- return ((CylindricalSubdetector)detector).getOuterRadius();
+ protected double getRMax()
+ {
+ return ((CylindricalSubdetector) detector).getOuterRadius();
}
}
