GeomConverter/src/org/lcsim/detector
diff -u -r1.8 -r1.9
--- GeometryInfo.java 20 Mar 2007 01:16:46 -0000 1.8
+++ GeometryInfo.java 20 Mar 2007 01:21:39 -0000 1.9
@@ -4,11 +4,10 @@
import hep.physics.vec.Hep3Vector;
/**
- * IGeometryInfo provides a cache of geometry
- * information for a single DetectorElement.
- * This includes transforms from local to
- * global, global to local, and parent to local,
- * as well as center position.
+ * IGeometryInfo provides a cache of detailed geometry
+ * information for its associated DetectorElement,
+ * including coordinate transformations and the
+ * center position in global coordinates.
*
* @author Jeremy McCormick <[log in to unmask]>
* @author Tim Nelson <[log in to unmask]>
@@ -180,79 +179,52 @@
setup(de,null,support);
}
- /* (non-Javadoc)
- * @see org.lcsim.detector.IGeometryInfoTest#childIGeometryInfos()
- */
public IGeometryInfoContainer getChildGeometryInfos()
{
return childIGeometryInfos;
}
- /* (non-Javadoc)
- * @see org.lcsim.detector.IGeometryInfoTest#getPhysicalVolumePath(hep.physics.vec.Hep3Vector)
- */
public IPhysicalVolumePath getPhysicalVolumePath(Hep3Vector globalPoint)
{
return PhysicalVolumeNavigatorStore.getInstance().getDefaultNavigator().getPath(globalPoint);
}
- /* (non-Javadoc)
- * @see org.lcsim.detector.IGeometryInfoTest#getLogicalVolume()
- */
public ILogicalVolume getLogicalVolume()
{
return logicalVolume;
}
- /* (non-Javadoc)
- * @see org.lcsim.detector.IGeometryInfoTest#getLogicalVolumeName()
- */
public String getLogicalVolumeName()
{
return getLogicalVolume().getName();
}
- /* (non-Javadoc)
- * @see org.lcsim.detector.IGeometryInfoTest#getPhysicalVolume(hep.physics.vec.Hep3Vector)
- */
public IPhysicalVolume getPhysicalVolume(Hep3Vector globalPoint)
{
return getPhysicalVolumePath(globalPoint).getLeafVolume();
}
- /* (non-Javadoc)
- * @see org.lcsim.detector.IGeometryInfoTest#getPosition()
- */
public Hep3Vector getPosition()
{
return globalPosition;
}
- /* (non-Javadoc)
- * @see org.lcsim.detector.IGeometryInfoTest#getPhysicalVolumePath()
- */
public IPhysicalVolumePath getPhysicalVolumePath()
{
return support;
}
- /* (non-Javadoc)
- * @see org.lcsim.detector.IGeometryInfoTest#globalToLocal()
- */
public ITransform3D getGlobalToLocal()
{
return globalToLocal;
}
- /* (non-Javadoc)
- * @see org.lcsim.detector.IGeometryInfoTest#globalToLocal(hep.physics.vec.Hep3Vector)
- */
public Hep3Vector transformGlobalToLocal(Hep3Vector global_point)
{
return globalToLocal.transformed(global_point);
}
- /* (non-Javadoc)
+ /**
*
* Check if the point @param globalPoint is inside this volume
* by transforming the point from global to local coordinates
@@ -287,33 +259,21 @@
return inside;
}
- /* (non-Javadoc)
- * @see org.lcsim.detector.IGeometryInfoTest#localToGlobal()
- */
public ITransform3D getLocalToGlobal()
{
return localToGlobal;
}
- /* (non-Javadoc)
- * @see org.lcsim.detector.IGeometryInfoTest#localToGlobal(hep.physics.vec.Hep3Vector)
- */
public Hep3Vector transformLocalToGlobal(Hep3Vector local_point)
{
return localToGlobal.transformed(local_point);
}
- /* (non-Javadoc)
- * @see org.lcsim.detector.IGeometryInfoTest#parentIGeometryInfo()
- */
public IGeometryInfo parentIGeometryInfo()
{
return parentIGeometryInfo;
}
- /* (non-Javadoc)
- * @see org.lcsim.detector.IGeometryInfoTest#parentToLocal()
- */
public ITransform3D getParentToLocal()
{
return parentToLocal;
@@ -324,13 +284,9 @@
return parentToLocal.transformed(parentPoint);
}
- /* (non-Javadoc)
- * @see org.lcsim.detector.IGeometryInfoTest#setSupport(org.lcsim.detector.IPhysicalVolumePath)
- */
public void setSupport(IPhysicalVolumePath support)
{
- setupSupport(support);
- //this.support = support;
+ setupSupport(support);
}
public boolean isGhost()