1 added + 3 modified, total 4 files
GeomConverter/src/org/lcsim/detector
diff -N Readout.java
--- /dev/null 1 Jan 1970 00:00:00 -0000
+++ Readout.java 27 Apr 2007 01:07:48 -0000 1.1
@@ -0,0 +1,36 @@
+package org.lcsim.detector;
+import java.util.ArrayList;
+import java.util.List;
+
+public class Readout<T>
+implements IReadout
+{
+ String name;
+ List<T> hits;
+
+ public Readout(String name)
+ {
+ this.name = name;
+ this.hits = new ArrayList<T>();
+ }
+
+ public Readout(String name, List<T> hits)
+ {
+ this.hits = hits;
+ }
+
+ public List<T> getHits()
+ {
+ return hits;
+ }
+
+ public void addHit(T hit)
+ {
+ hits.add(hit);
+ }
+
+ public String getName()
+ {
+ return name;
+ }
+}
\ No newline at end of file
GeomConverter/src/org/lcsim/detector
diff -u -r1.13 -r1.14
--- DetectorElement.java 19 Apr 2007 23:03:21 -0000 1.13
+++ DetectorElement.java 27 Apr 2007 01:07:48 -0000 1.14
@@ -14,6 +14,7 @@
private IDetectorElement parent = null;
private IIdentifier id = null;
private IParameters parameters = new Parameters();
+ private IReadout readout;
/**
* Create a DE with complete arguments, including
@@ -270,12 +271,15 @@
return srch;
}
- /*
public IReadout getReadout()
{
return readout;
+ }
+
+ public void setReadout(IReadout readout)
+ {
+ this.readout = readout;
}
- */
public IParameters getParameters()
{
GeomConverter/src/org/lcsim/detector
diff -u -r1.9 -r1.10
--- IDetectorElement.java 19 Apr 2007 23:03:21 -0000 1.9
+++ IDetectorElement.java 27 Apr 2007 01:07:48 -0000 1.10
@@ -11,7 +11,7 @@
*
* @author Tim Nelson <[log in to unmask]>
* @author Jeremy McCormick <[log in to unmask]>
- * @version $Id: IDetectorElement.java,v 1.9 2007/04/19 23:03:21 jeremy Exp $
+ * @version $Id: IDetectorElement.java,v 1.10 2007/04/27 01:07:48 jeremy Exp $
*/
public interface IDetectorElement
extends IIdentifiable, INamed
@@ -106,7 +106,7 @@
* @return Associated IReadout object or <code>null</code> if
* no IReadout has been assigned to this DetectorElement.
*/
- //public IReadout getReadout();
+ public IReadout getReadout();
/**
* The named parameters associated with this DetectorElement.
GeomConverter/src/org/lcsim/detector
diff -u -r1.1 -r1.2
--- IReadout.java 18 Apr 2007 22:07:11 -0000 1.1
+++ IReadout.java 27 Apr 2007 01:07:48 -0000 1.2
@@ -2,8 +2,8 @@
import java.util.List;
-public interface IReadout<T>
+public interface IReadout
{
public String getName();
- public List<T> getDigits();
+ public List<?> getHits();
}
\ No newline at end of file
CVSspam 0.2.8