GeomConverter/src/org/lcsim/geometry
diff -u -r1.8.2.2 -r1.8.2.3
--- Subdetector.java 28 Sep 2005 05:44:15 -0000 1.8.2.2
+++ Subdetector.java 28 Oct 2005 00:16:51 -0000 1.8.2.3
@@ -10,6 +10,7 @@
{
String getName();
IDDecoder getIDDecoder();
+ Layering getLayering();
boolean isTracker();
boolean isCalorimeter();
@@ -17,4 +18,4 @@
boolean isEndcap();
double[] transformLocalToGlobal(double[] localPos);
-}
\ No newline at end of file
+}
GeomConverter/src/org/lcsim/geometry/compact
diff -u -r1.8.2.1 -r1.8.2.2
--- Subdetector.java 28 Sep 2005 05:44:16 -0000 1.8.2.1
+++ Subdetector.java 28 Oct 2005 00:16:52 -0000 1.8.2.2
@@ -6,6 +6,7 @@
import org.lcsim.geometry.layer.Layering;
import org.lcsim.geometry.IDDecoder;
import org.lcsim.geometry.SubdetectorIDDecoder;
+import org.lcsim.geometry.layer.Layering;
/**
*
@@ -105,4 +106,9 @@
{
return reflect;
}
-}
\ No newline at end of file
+
+ public Layering getLayering()
+ {
+ throw new RuntimeException("layers not implemented");
+ }
+}
GeomConverter/src/org/lcsim/geometry/subdetector
diff -u -r1.1.2.1 -r1.1.2.2
--- AbstractSubdetector.java 28 Sep 2005 05:44:18 -0000 1.1.2.1
+++ AbstractSubdetector.java 28 Oct 2005 00:16:52 -0000 1.1.2.2
@@ -14,13 +14,14 @@
import org.jdom.JDOMException;
import org.lcsim.geometry.HepRepProvider;
import org.lcsim.geometry.SubdetectorIDDecoder;
+import org.lcsim.geometry.layer.Layering;
/**
*
* @author jeremym
*
- * This class is supposed to simplify inheritance hierarchy for org.lcsim.geometry.subdetector
- * implementation classes, which extend it.
+ * This class is meant to simplify inheritance hierarchy for org.lcsim.geometry.subdetector
+ * implementation classes that extend it.
*
*/
abstract class AbstractSubdetector
@@ -42,4 +43,6 @@
/** FIXME: Should live in org.lcsim.geometry.heprep or equivalent. */
public void appendHepRep(HepRepFactory factory, HepRep heprep)
{}
-}
\ No newline at end of file
+
+ abstract public Layering getLayering();
+}