5 added + 6 removed + 5 modified, total 16 files
lcsim/src/org/lcsim/event
diff -u -r1.8 -r1.9
--- CalorimeterHit.java 23 May 2008 03:12:09 -0000 1.8
+++ CalorimeterHit.java 23 May 2008 03:39:51 -0000 1.9
@@ -1,12 +1,13 @@
package org.lcsim.event;
+import org.lcsim.event.base.HasMetaData;
import org.lcsim.geometry.IDDecoder;
import org.lcsim.geometry.Subdetector;
/**
* A hit in a calorimeter.
* @author tonyj
- * @version $Id: CalorimeterHit.java,v 1.8 2008/05/23 03:12:09 jeremy Exp $
+ * @version $Id: CalorimeterHit.java,v 1.9 2008/05/23 03:39:51 jeremy Exp $
*/
public interface CalorimeterHit
extends HasMetaData
lcsim/src/org/lcsim/event
diff -u -r1.17 -r1.18
--- SimTrackerHit.java 23 May 2008 03:12:09 -0000 1.17
+++ SimTrackerHit.java 23 May 2008 03:39:52 -0000 1.18
@@ -6,9 +6,10 @@
import org.lcsim.detector.HasDetectorElement;
import org.lcsim.detector.identifier.Identifiable;
+import org.lcsim.event.base.HasMetaData;
/**
- * @version $Id: SimTrackerHit.java,v 1.17 2008/05/23 03:12:09 jeremy Exp $
+ * @version $Id: SimTrackerHit.java,v 1.18 2008/05/23 03:39:52 jeremy Exp $
*/
public interface SimTrackerHit
extends HasDetectorElement, HasMetaData, Identifiable
lcsim/src/org/lcsim/event
diff -N AbstractSimHit.java
--- AbstractSimHit.java 23 May 2008 03:12:09 -0000 1.1
+++ /dev/null 1 Jan 1970 00:00:00 -0000
@@ -1,70 +0,0 @@
-package org.lcsim.event;
-
-import org.lcsim.detector.IDetectorElement;
-import org.lcsim.detector.identifier.IExpandedIdentifier;
-import org.lcsim.detector.identifier.IIdentifier;
-import org.lcsim.detector.identifier.IIdentifierHelper;
-import org.lcsim.event.EventHeader.LCMetaData;
-import org.lcsim.geometry.IDDecoder;
-import org.lcsim.geometry.Subdetector;
-
-public class AbstractSimHit
-implements SimHit
-{
- protected LCMetaData meta;
- protected IExpandedIdentifier expId;
- protected IIdentifier compactId;
- protected IDetectorElement de;
-
- public LCMetaData getMetaData()
- {
- return meta;
- }
-
- // FIXME: This could be made protected, if BaseLCSimEvent is moved to this package.
- public void setMetaData(LCMetaData meta)
- {
- this.meta = meta;
- }
-
- public Subdetector getSubdetector()
- {
- return getIDDecoder().getSubdetector();
- }
-
- public IDetectorElement getDetectorElement()
- {
- return de;
- }
-
- // FIXME: Ideally, this should be protected or package level, but we
- // need to call it from SimTrackerHitIdentifierReadoutDriver.
- public void setDetectorElement(IDetectorElement de)
- {
- this.de = de;
- }
-
- public IExpandedIdentifier getExpandedIdentifier()
- {
- if (expId == null)
- {
- expId = getIdentifierHelper().unpack(getIdentifier());
- }
- return expId;
- }
-
- public IIdentifier getIdentifier()
- {
- return compactId;
- }
-
- public IIdentifierHelper getIdentifierHelper()
- {
- return getSubdetector().getDetectorElement().getIdentifierHelper();
- }
-
- public IDDecoder getIDDecoder()
- {
- return meta.getIDDecoder();
- }
-}
lcsim/src/org/lcsim/event
diff -N HasCellID.java
--- HasCellID.java 23 May 2008 03:12:09 -0000 1.1
+++ /dev/null 1 Jan 1970 00:00:00 -0000
@@ -1,6 +0,0 @@
-package org.lcsim.event;
-
-public interface HasCellID
-{
- public long getCellID();
-}
lcsim/src/org/lcsim/event
diff -N HasIDDecoder.java
--- HasIDDecoder.java 23 May 2008 03:12:09 -0000 1.1
+++ /dev/null 1 Jan 1970 00:00:00 -0000
@@ -1,8 +0,0 @@
-package org.lcsim.event;
-
-import org.lcsim.geometry.IDDecoder;
-
-public interface HasIDDecoder
-{
- public IDDecoder getIDDecoder();
-}
lcsim/src/org/lcsim/event
diff -N HasMetaData.java
--- HasMetaData.java 23 May 2008 03:12:09 -0000 1.1
+++ /dev/null 1 Jan 1970 00:00:00 -0000
@@ -1,14 +0,0 @@
-package org.lcsim.event;
-
-import org.lcsim.event.EventHeader.LCMetaData;
-
-/**
- * A simple mixin interface for objects that have associated <code>LCMetaData</code>.
- * @author jeremym
- *
- */
-public interface HasMetaData
-{
- public LCMetaData getMetaData();
- public void setMetaData(LCMetaData meta);
-}
\ No newline at end of file
lcsim/src/org/lcsim/event
diff -N HasSubdetector.java
--- HasSubdetector.java 23 May 2008 03:12:09 -0000 1.1
+++ /dev/null 1 Jan 1970 00:00:00 -0000
@@ -1,8 +0,0 @@
-package org.lcsim.event;
-
-import org.lcsim.geometry.Subdetector;
-
-public interface HasSubdetector
-{
- public Subdetector getSubdetector();
-}
lcsim/src/org/lcsim/event
diff -N SimHit.java
--- SimHit.java 23 May 2008 03:12:09 -0000 1.1
+++ /dev/null 1 Jan 1970 00:00:00 -0000
@@ -1,9 +0,0 @@
-package org.lcsim.event;
-
-import org.lcsim.detector.HasDetectorElement;
-import org.lcsim.detector.identifier.Identifiable;
-
-public interface SimHit
-extends HasSubdetector, HasIDDecoder, HasDetectorElement,
- Identifiable, HasMetaData
-{}
\ No newline at end of file
lcsim/src/org/lcsim/event/base
diff -N AbstractSimHit.java
--- /dev/null 1 Jan 1970 00:00:00 -0000
+++ AbstractSimHit.java 23 May 2008 03:39:52 -0000 1.1
@@ -0,0 +1,71 @@
+package org.lcsim.event.base;
+
+import org.lcsim.detector.IDetectorElement;
+import org.lcsim.detector.identifier.IExpandedIdentifier;
+import org.lcsim.detector.identifier.IIdentifier;
+import org.lcsim.detector.identifier.IIdentifierHelper;
+import org.lcsim.event.EventHeader;
+import org.lcsim.event.EventHeader.LCMetaData;
+import org.lcsim.geometry.IDDecoder;
+import org.lcsim.geometry.Subdetector;
+
+public class AbstractSimHit
+implements SimHit
+{
+ protected LCMetaData meta;
+ protected IExpandedIdentifier expId;
+ protected IIdentifier compactId;
+ protected IDetectorElement de;
+
+ public LCMetaData getMetaData()
+ {
+ return meta;
+ }
+
+ // FIXME: This could be made protected, if BaseLCSimEvent is moved to this package.
+ public void setMetaData(LCMetaData meta)
+ {
+ this.meta = meta;
+ }
+
+ public Subdetector getSubdetector()
+ {
+ return getIDDecoder().getSubdetector();
+ }
+
+ public IDetectorElement getDetectorElement()
+ {
+ return de;
+ }
+
+ // FIXME: Ideally, this should be protected or package level, but we
+ // need to call it from SimTrackerHitIdentifierReadoutDriver.
+ public void setDetectorElement(IDetectorElement de)
+ {
+ this.de = de;
+ }
+
+ public IExpandedIdentifier getExpandedIdentifier()
+ {
+ if (expId == null)
+ {
+ expId = getIdentifierHelper().unpack(getIdentifier());
+ }
+ return expId;
+ }
+
+ public IIdentifier getIdentifier()
+ {
+ return compactId;
+ }
+
+ public IIdentifierHelper getIdentifierHelper()
+ {
+ return getSubdetector().getDetectorElement().getIdentifierHelper();
+ }
+
+ public IDDecoder getIDDecoder()
+ {
+ return meta.getIDDecoder();
+ }
+}
lcsim/src/org/lcsim/event/base
diff -N HasIDDecoder.java
--- /dev/null 1 Jan 1970 00:00:00 -0000
+++ HasIDDecoder.java 23 May 2008 03:39:52 -0000 1.1
@@ -0,0 +1,8 @@
+package org.lcsim.event.base;
+
+import org.lcsim.geometry.IDDecoder;
+
+public interface HasIDDecoder
+{
+ public IDDecoder getIDDecoder();
+}
lcsim/src/org/lcsim/event/base
diff -N HasMetaData.java
--- /dev/null 1 Jan 1970 00:00:00 -0000
+++ HasMetaData.java 23 May 2008 03:39:52 -0000 1.1
@@ -0,0 +1,15 @@
+package org.lcsim.event.base;
+
+import org.lcsim.event.EventHeader;
+import org.lcsim.event.EventHeader.LCMetaData;
+
+/**
+ * A simple mixin interface for objects that have associated <code>LCMetaData</code>.
+ * @author jeremym
+ *
+ */
+public interface HasMetaData
+{
+ public LCMetaData getMetaData();
+ public void setMetaData(LCMetaData meta);
+}
\ No newline at end of file
lcsim/src/org/lcsim/event/base
diff -N HasSubdetector.java
--- /dev/null 1 Jan 1970 00:00:00 -0000
+++ HasSubdetector.java 23 May 2008 03:39:52 -0000 1.1
@@ -0,0 +1,8 @@
+package org.lcsim.event.base;
+
+import org.lcsim.geometry.Subdetector;
+
+public interface HasSubdetector
+{
+ public Subdetector getSubdetector();
+}
lcsim/src/org/lcsim/event/base
diff -N SimHit.java
--- /dev/null 1 Jan 1970 00:00:00 -0000
+++ SimHit.java 23 May 2008 03:39:52 -0000 1.1
@@ -0,0 +1,9 @@
+package org.lcsim.event.base;
+
+import org.lcsim.detector.HasDetectorElement;
+import org.lcsim.detector.identifier.Identifiable;
+
+public interface SimHit
+extends HasSubdetector, HasIDDecoder, HasDetectorElement,
+ Identifiable, HasMetaData
+{}
\ No newline at end of file
lcsim/src/org/lcsim/event/base
diff -u -r1.2 -r1.3
--- BaseCalorimeterHit.java 23 May 2008 03:36:09 -0000 1.2
+++ BaseCalorimeterHit.java 23 May 2008 03:39:52 -0000 1.3
@@ -1,6 +1,5 @@
package org.lcsim.event.base;
-import org.lcsim.event.AbstractSimHit;
import org.lcsim.event.CalorimeterHit;
import org.lcsim.event.util.SamplingFractionManager;
import org.lcsim.geometry.IDDecoder;
lcsim/src/org/lcsim/event/base
diff -u -r1.1 -r1.2
--- BaseLCSimEvent.java 23 May 2008 03:12:09 -0000 1.1
+++ BaseLCSimEvent.java 23 May 2008 03:39:52 -0000 1.2
@@ -13,7 +13,6 @@
import org.lcsim.conditions.ConditionsManager.ConditionsNotFoundException;
import org.lcsim.event.Cluster;
import org.lcsim.event.EventHeader;
-import org.lcsim.event.HasMetaData;
import org.lcsim.event.MCParticle;
import org.lcsim.event.SimCalorimeterHit;
import org.lcsim.event.SimTrackerHit;
lcsim/src/org/lcsim/event/base
diff -u -r1.4 -r1.5
--- BaseSimTrackerHit.java 23 May 2008 03:12:09 -0000 1.4
+++ BaseSimTrackerHit.java 23 May 2008 03:39:52 -0000 1.5
@@ -5,7 +5,6 @@
import hep.physics.vec.VecOp;
import org.lcsim.detector.IDetectorElement;
-import org.lcsim.event.AbstractSimHit;
import org.lcsim.event.MCParticle;
import org.lcsim.event.SimTrackerHit;
import org.lcsim.event.EventHeader.LCMetaData;
CVSspam 0.2.8
