lcsim/src/org/lcsim/event/base
diff -u -r1.1 -r1.2
--- BaseRawTrackerHit.java 24 Oct 2006 19:01:48 -0000 1.1
+++ BaseRawTrackerHit.java 21 May 2007 23:23:11 -0000 1.2
@@ -1,5 +1,6 @@
package org.lcsim.event.base;
+import java.util.List;
import org.lcsim.event.RawTrackerHit;
import org.lcsim.event.SimTrackerHit;
import org.lcsim.geometry.IDDecoder;
@@ -8,7 +9,7 @@
/**
* A basic implementation of RawTrackerHit
* @author Tony Johnson
- * @version $Id: BaseRawTrackerHit.java,v 1.1 2006/10/24 19:01:48 tonyj Exp $
+ * @version $Id: BaseRawTrackerHit.java,v 1.2 2007/05/21 23:23:11 tonyj Exp $
*/
public class BaseRawTrackerHit implements RawTrackerHit
{
@@ -16,15 +17,15 @@
protected long cellId;
protected short[] adcValues;
protected IDDecoder decoder;
- protected SimTrackerHit simTrackerHit;
+ protected List<SimTrackerHit> simTrackerHits;
- public BaseRawTrackerHit(int time, long cellId, short[] adcValues, IDDecoder decoder, SimTrackerHit simTrackerHit)
+ public BaseRawTrackerHit(int time, long cellId, short[] adcValues, IDDecoder decoder, List<SimTrackerHit> simTrackerHit)
{
this.time = time;
this.cellId = cellId;
this.adcValues = adcValues;
this.decoder = decoder;
- this.simTrackerHit = simTrackerHit;
+ this.simTrackerHits = simTrackerHits;
}
/**
* Constructor for use by subclasses
@@ -59,8 +60,8 @@
return decoder.getSubdetector();
}
- public SimTrackerHit getSimTrackerHit()
+ public List<SimTrackerHit> getSimTrackerHit()
{
- return simTrackerHit;
+ return simTrackerHits;
}
}
lcsim/src/org/lcsim/event
diff -u -r1.3 -r1.4
--- RawTrackerHit.java 9 May 2007 19:04:55 -0000 1.3
+++ RawTrackerHit.java 21 May 2007 23:23:11 -0000 1.4
@@ -1,12 +1,13 @@
package org.lcsim.event;
+import java.util.List;
import org.lcsim.geometry.IDDecoder;
import org.lcsim.geometry.Subdetector;
/**
* A raw tracker hit (as expected in raw data from a real detector)
* @author tonyj
- * @version $Id: RawTrackerHit.java,v 1.3 2007/05/09 19:04:55 tonyj Exp $
+ * @version $Id: RawTrackerHit.java,v 1.4 2007/05/21 23:23:11 tonyj Exp $
*/
public interface RawTrackerHit
{
@@ -47,6 +48,6 @@
// FixMe: This should return an array of tracker hits
// Note, Rob is worried that returning SimTrackerHits here will force recalculation of digitizing objects
// while overlaying background events.
- //List<SimTrackerHit> getSimTrackerHit();
- SimTrackerHit getSimTrackerHit();
+ List<SimTrackerHit> getSimTrackerHit();
+ //SimTrackerHit getSimTrackerHit();
}