Author: [log in to unmask]
Date: Wed Dec 17 03:41:07 2014
New Revision: 3465
Log:
Use the basic Hit interface for assigning meta data to objects when collections are added to the event.
Modified:
projects/lcsim/trunk/event-model/src/main/java/org/lcsim/event/base/BaseLCSimEvent.java
Modified: projects/lcsim/trunk/event-model/src/main/java/org/lcsim/event/base/BaseLCSimEvent.java
=============================================================================
--- projects/lcsim/trunk/event-model/src/main/java/org/lcsim/event/base/BaseLCSimEvent.java (original)
+++ projects/lcsim/trunk/event-model/src/main/java/org/lcsim/event/base/BaseLCSimEvent.java Wed Dec 17 03:41:07 2014
@@ -16,7 +16,7 @@
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.Hit;
import org.lcsim.event.MCParticle;
import org.lcsim.event.SimCalorimeterHit;
import org.lcsim.event.SimTrackerHit;
@@ -153,14 +153,12 @@
}
private void setCollectionMetaData(List collection, Class type, LCMetaData meta) {
- // Set MetaData on collection objects.
- if (HasMetaData.class.isAssignableFrom(type)) {
+ // Set MetaData on collection objects if necessary.
+ if (Hit.class.isAssignableFrom(type)) {
for (Object o : collection) {
- if (o instanceof BaseHit) {
- BaseHit hit = (BaseHit) o;
- if (hit.getMetaData() == null) {
- ((BaseHit) o).setMetaData(meta);
- }
+ Hit hit = (Hit) o;
+ if (hit.getMetaData() == null) {
+ ((Hit) o).setMetaData(meta);
}
}
}
########################################################################
Use REPLY-ALL to reply to list
To unsubscribe from the LCDET-SVN list, click the following link:
https://listserv.slac.stanford.edu/cgi-bin/wa?SUBED1=LCDET-SVN&A=1
|