Author: [log in to unmask]
Date: Thu Feb 5 18:12:36 2015
New Revision: 3511
Log:
Use string for collection names instead of EventHeader constants.
Modified:
projects/lcsim/trunk/mc/src/main/java/org/lcsim/mc/fast/cluster/ronan/MCFastRonan.java
projects/lcsim/trunk/mc/src/main/java/org/lcsim/mc/fast/tracking/MCFastTracking.java
projects/lcsim/trunk/mc/src/main/java/org/lcsim/mc/fast/tracking/fix/FastMCTrackDriver.java
projects/lcsim/trunk/recon-drivers/src/main/java/org/lcsim/recon/util/McTruthLinker.java
projects/lcsim/trunk/recon-drivers/src/main/java/org/lcsim/recon/util/RemoveUnusedTrackerHits.java
projects/lcsim/trunk/recon-drivers/src/main/java/org/lcsim/recon/util/TrackSubdetectorHitNumbersDriver.java
projects/lcsim/trunk/tracking/src/main/java/org/lcsim/recon/tracking/seedtracker/MakeTracks.java
projects/lcsim/trunk/tracking/src/main/java/org/lcsim/recon/tracking/seedtracker/SeedTrackerTrackStateDriver.java
Modified: projects/lcsim/trunk/mc/src/main/java/org/lcsim/mc/fast/cluster/ronan/MCFastRonan.java
=============================================================================
--- projects/lcsim/trunk/mc/src/main/java/org/lcsim/mc/fast/cluster/ronan/MCFastRonan.java (original)
+++ projects/lcsim/trunk/mc/src/main/java/org/lcsim/mc/fast/cluster/ronan/MCFastRonan.java Thu Feb 5 18:12:36 2015
@@ -145,7 +145,7 @@
for (Cluster rcl : cl)
if (Math.abs(((ReconCluster) rcl).getMCParticle().getCharge()) < Double.MIN_VALUE && ((ReconCluster) rcl).getNegEnergy() >= 0.)
((ReconCluster) rcl).adjustEnergy(neg_energy_total, pos_energy_weight_total);
- event.put(EventHeader.CLUSTERS, cl, Cluster.class, 0);
+ event.put("Clusters", cl, Cluster.class, 0);
event.put("ClustersToMCP", lcrelationList, LCRelation.class, 0);
}
Modified: projects/lcsim/trunk/mc/src/main/java/org/lcsim/mc/fast/tracking/MCFastTracking.java
=============================================================================
--- projects/lcsim/trunk/mc/src/main/java/org/lcsim/mc/fast/tracking/MCFastTracking.java (original)
+++ projects/lcsim/trunk/mc/src/main/java/org/lcsim/mc/fast/tracking/MCFastTracking.java Thu Feb 5 18:12:36 2015
@@ -138,7 +138,7 @@
}
}
if (outputListName == null) {
- outputListName = EventHeader.TRACKS;
+ outputListName = "Tracks";
}
event.put(outputListName, trackList, Track.class, 0);
event.put("TracksToMCP", lcrelationList, LCRelation.class, 0);
Modified: projects/lcsim/trunk/mc/src/main/java/org/lcsim/mc/fast/tracking/fix/FastMCTrackDriver.java
=============================================================================
--- projects/lcsim/trunk/mc/src/main/java/org/lcsim/mc/fast/tracking/fix/FastMCTrackDriver.java (original)
+++ projects/lcsim/trunk/mc/src/main/java/org/lcsim/mc/fast/tracking/fix/FastMCTrackDriver.java Thu Feb 5 18:12:36 2015
@@ -85,7 +85,7 @@
Track t = factory.getTrack(p);
trackList.add(t);
}
- event.put(EventHeader.TRACKS, trackList, Track.class, 0);
+ event.put("Tracks", trackList, Track.class, 0);
}
public void conditionsChanged(ConditionsEvent event) {
Modified: projects/lcsim/trunk/recon-drivers/src/main/java/org/lcsim/recon/util/McTruthLinker.java
=============================================================================
--- projects/lcsim/trunk/recon-drivers/src/main/java/org/lcsim/recon/util/McTruthLinker.java (original)
+++ projects/lcsim/trunk/recon-drivers/src/main/java/org/lcsim/recon/util/McTruthLinker.java Thu Feb 5 18:12:36 2015
@@ -79,7 +79,7 @@
public class McTruthLinker extends Driver {
protected String trackHitMcRelationName = "HelicalTrackMCRelations";
- protected String trackCollectionName = EventHeader.TRACKS;
+ protected String trackCollectionName = "Tracks";
protected String trackMcRelationName = "TrackMCTruthLink";
protected String caloHitSimHitRelationName = "CalorimeterHitRelations";
protected String clusterCollectionName = "ReconClusters";
Modified: projects/lcsim/trunk/recon-drivers/src/main/java/org/lcsim/recon/util/RemoveUnusedTrackerHits.java
=============================================================================
--- projects/lcsim/trunk/recon-drivers/src/main/java/org/lcsim/recon/util/RemoveUnusedTrackerHits.java (original)
+++ projects/lcsim/trunk/recon-drivers/src/main/java/org/lcsim/recon/util/RemoveUnusedTrackerHits.java Thu Feb 5 18:12:36 2015
@@ -24,7 +24,7 @@
public RemoveUnusedTrackerHits() {
trackHitCollection = "HelicalTrackHits";
- trackCollection = EventHeader.TRACKS;
+ trackCollection = "Tracks";
clearRawTrackerHits = true;
}
Modified: projects/lcsim/trunk/recon-drivers/src/main/java/org/lcsim/recon/util/TrackSubdetectorHitNumbersDriver.java
=============================================================================
--- projects/lcsim/trunk/recon-drivers/src/main/java/org/lcsim/recon/util/TrackSubdetectorHitNumbersDriver.java (original)
+++ projects/lcsim/trunk/recon-drivers/src/main/java/org/lcsim/recon/util/TrackSubdetectorHitNumbersDriver.java Thu Feb 5 18:12:36 2015
@@ -15,27 +15,22 @@
//
// Author: Philipp Roloff
+import hep.physics.vec.BasicHep3Vector;
+import hep.physics.vec.Hep3Vector;
+
import java.util.List;
-import java.util.Map;
import java.util.Set;
-
import java.util.logging.Level;
-import hep.physics.vec.Hep3Vector;
-import hep.physics.vec.BasicHep3Vector;
-
-import org.lcsim.event.base.BaseTrack;
-import org.lcsim.util.Driver;
-
+import org.lcsim.detector.IDetectorElement;
import org.lcsim.event.EventHeader;
+import org.lcsim.event.RawTrackerHit;
import org.lcsim.event.Track;
import org.lcsim.event.TrackerHit;
-import org.lcsim.event.RawTrackerHit;
-
+import org.lcsim.event.base.BaseTrack;
import org.lcsim.geometry.Detector;
import org.lcsim.geometry.compact.Subdetector;
-
-import org.lcsim.detector.IDetectorElement;
+import org.lcsim.util.Driver;
public class TrackSubdetectorHitNumbersDriver extends Driver {
@@ -46,7 +41,7 @@
@Override
protected void startOfData() {
- trackCollection = EventHeader.TRACKS;
+ trackCollection = "Tracks";
}
public void setTrackCollection(String trackCollection) {
Modified: projects/lcsim/trunk/tracking/src/main/java/org/lcsim/recon/tracking/seedtracker/MakeTracks.java
=============================================================================
--- projects/lcsim/trunk/tracking/src/main/java/org/lcsim/recon/tracking/seedtracker/MakeTracks.java (original)
+++ projects/lcsim/trunk/tracking/src/main/java/org/lcsim/recon/tracking/seedtracker/MakeTracks.java Thu Feb 5 18:12:36 2015
@@ -25,7 +25,7 @@
*/
public class MakeTracks {
- private String _TrkCollectionName = EventHeader.TRACKS;
+ private String _TrkCollectionName = "Tracks";
TrackCheck _trackCheck; // set by SeedTracker
/**
Modified: projects/lcsim/trunk/tracking/src/main/java/org/lcsim/recon/tracking/seedtracker/SeedTrackerTrackStateDriver.java
=============================================================================
--- projects/lcsim/trunk/tracking/src/main/java/org/lcsim/recon/tracking/seedtracker/SeedTrackerTrackStateDriver.java (original)
+++ projects/lcsim/trunk/tracking/src/main/java/org/lcsim/recon/tracking/seedtracker/SeedTrackerTrackStateDriver.java Thu Feb 5 18:12:36 2015
@@ -82,7 +82,7 @@
public void process(EventHeader event)
{
// Get the Tracks from the event. Collection name is SeedTracker's default.
- List<Track> tracks = event.get(Track.class, EventHeader.TRACKS);
+ List<Track> tracks = event.get(Track.class, "Tracks");
// TrackState lists.
List<GenericObject> startObjs = new ArrayList<GenericObject>();
########################################################################
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
|
