GeomConverter/src/org/lcsim/detector
diff -u -r1.2 -r1.3
--- PhysicalVolumeNavigator.java 3 Mar 2007 13:33:56 -0000 1.2
+++ PhysicalVolumeNavigator.java 3 Mar 2007 13:59:17 -0000 1.3
@@ -38,8 +38,8 @@
{
// Multiply the daughter by the combined
// transform up to this point to get the
- // combined global to local transform.
- // !!! WRONG ... NEEDS TO BE FIXED !!!
+ // combined global to local transform.
+ // !!! Is this correct??? !!!
CoordinateTransformation3D combinedTransform
= CoordinateTransformation3D.multiply(
getTransform(path),
@@ -47,7 +47,7 @@
dau.getTransform());
// Check if the global point is inside the volume's solid.
- // !!! WRONG ... NEEDS TO BE FIXED !!!
+ // !!! Is this correct??? !!!
if (dau.getLogicalVolume().getSolid().isInside(
dau.getTransform().transformed(globalPoint)))
{
GeomConverter/src/org/lcsim/detector/material
diff -u -r1.1 -r1.2
--- BetheBlochCalculator.java 3 Mar 2007 01:19:39 -0000 1.1
+++ BetheBlochCalculator.java 3 Mar 2007 13:59:17 -0000 1.2
@@ -159,7 +159,7 @@
double rho_STP = density;
double rho = density;
- if (state == State.Gas)
+ if (state == IMaterial.Gas)
{
eta = pressure * (273.15 / temperature);
rho_STP = rho / eta;
@@ -175,7 +175,7 @@
double Xa = Cbar / 4.6052;
double X1;
- if (state == State.Gas)
+ if (state == IMaterial.Gas)
{
if (Cbar < 12.25)
{
@@ -201,7 +201,7 @@
double m = 3.0;
double X0 = 0;
- if (state == State.Gas)
+ if (state == IMaterial.Gas)
{
if (Cbar < 10.0) X0 = 1.6;
else if (Cbar < 10.5) X0 = 1.7;
@@ -231,7 +231,7 @@
//double ASP = 0.1536 * ZoverA;
//double BSP = log(511.0e9 / I2);
- if (state == State.Gas)
+ if (state == IMaterial.Gas)
{
double eta_corr_1 = 0.5 * log10(eta);
double eta_corr_2 = 4.6052 * eta_corr_1;