3 modified files
GeomConverter/src/org/lcsim/geometry
diff -u -r1.5 -r1.6
--- Calorimeter.java 20 Jul 2005 19:11:55 -0000 1.5
+++ Calorimeter.java 2 Aug 2005 16:27:54 -0000 1.6
@@ -11,5 +11,9 @@
*/
public interface Calorimeter extends LayeredSubdetector
{
- CalorimeterIDDecoder getCalorimeterIDDecoder();
+ //Fixme: This is not the recommended way for user to get the IDDecoder.
+ CalorimeterIDDecoder getCalorimeterIDDecoder();
+ // Fixme: This would make sense, but is not provided by compact reader
+ // so cannot go here.
+ // double getSamplingFraction();
}
\ No newline at end of file
GeomConverter/src/org/lcsim/geometry
diff -u -r1.8 -r1.9
--- CalorimeterIDDecoder.java 24 Jul 2005 06:47:41 -0000 1.8
+++ CalorimeterIDDecoder.java 2 Aug 2005 16:27:54 -0000 1.9
@@ -1,10 +1,3 @@
-/*
- * CalorimeterIDDecoder.java
- *
- * Created on July 20, 2005, 3:04 AM
- *
- */
-
package org.lcsim.geometry;
import org.lcsim.geometry.subdetector.SubdetectorIDDecoder;
@@ -15,6 +8,8 @@
abstract public class CalorimeterIDDecoder extends SubdetectorIDDecoder
{
/* @return Calorimeter that this SubdetectorIDDecoder uses. */
+ // Fixme: This should be removed, there is no gaurantee that an IDDecoder
+ // belongs to a particular Subdetector.
abstract public Calorimeter getCalorimeter();
/* FIXME: doesn't need to be at top-level */
GeomConverter/src/org/lcsim/geometry/subdetector
diff -u -r1.2 -r1.3
--- CalorimeterBase.java 20 Jul 2005 19:11:59 -0000 1.2
+++ CalorimeterBase.java 2 Aug 2005 16:27:54 -0000 1.3
@@ -5,18 +5,17 @@
*
*/
package org.lcsim.geometry.subdetector;
-import org.lcsim.geometry.subdetector.CalorimeterIDDecoder;
import org.jdom.Element;
import org.jdom.JDOMException;
-import org.lcsim.geometry.layer.Layering;
+import org.lcsim.geometry.Calorimeter;
/**
*
* @author jeremym
*/
public class CalorimeterBase
- extends LayeredSubdetectorBase
+ extends LayeredSubdetectorBase implements Calorimeter
{
/** Creates a new instance of CalorimeterBase */
public CalorimeterBase(Element node) throws JDOMException
CVSspam 0.2.8