Print

Print


Commit in lcsim/src/org/lcsim/contrib/seedtracker on MAIN
MakeTracks.java+5-11.1 -> 1.2
SeedCandidate.java+1-151.4 -> 1.5
+6-16
2 modified files
Output HelicalTrackHits, which now implement the TrackerHit interface, when you get the hits from a track created by seedtracker

lcsim/src/org/lcsim/contrib/seedtracker
MakeTracks.java 1.1 -> 1.2
diff -u -r1.1 -r1.2
--- MakeTracks.java	7 Feb 2008 18:20:50 -0000	1.1
+++ MakeTracks.java	14 Mar 2008 18:58:22 -0000	1.2
@@ -13,7 +13,9 @@
 import org.lcsim.event.base.BaseTrack;
 import org.lcsim.event.EventHeader;
 import org.lcsim.event.Track;
+import org.lcsim.event.TrackerHit;
 import org.lcsim.fit.helicaltrack.HelicalTrackFit;
+import org.lcsim.fit.helicaltrack.HelicalTrackHit;
 
 /**
  *
@@ -34,7 +36,9 @@
         ref[2] = 0.;
         for (SeedCandidate trackseed : seedlist) {
             BaseTrack trk = new BaseTrack();
-            trk.addHits(trackseed.getTrackerHits());
+            for (HelicalTrackHit hit : trackseed.getHits()) {
+                trk.addHit((TrackerHit) hit);
+            }
             HelicalTrackFit helix = trackseed.getHelix();
             trk.setChisq(helix.chisqtot());
             trk.setCovarianceMatrix(helix.covariance());

lcsim/src/org/lcsim/contrib/seedtracker
SeedCandidate.java 1.4 -> 1.5
diff -u -r1.4 -r1.5
--- SeedCandidate.java	7 Feb 2008 18:20:50 -0000	1.4
+++ SeedCandidate.java	14 Mar 2008 18:58:22 -0000	1.5
@@ -9,11 +9,9 @@
 
 package org.lcsim.contrib.seedtracker;
 
-import java.util.ArrayList;
 import java.util.LinkedList;
 import java.util.List;
 
-import org.lcsim.event.TrackerHit;
 import org.lcsim.fit.helicaltrack.HelicalTrackFit;
 import org.lcsim.fit.helicaltrack.HelicalTrackHit;
 
@@ -60,7 +58,7 @@
      * Assign a list of TrackerHits to the SeedCandidate
      * @param trackerhits List of TrackerHits for the SeedCandidate
      */
-    public void setTrackerHits(List<HelicalTrackHit> hits) {
+    public void setHits(List<HelicalTrackHit> hits) {
         _hits.clear();
         _hits.addAll(hits);
         return;
@@ -89,18 +87,6 @@
     }
     
     /**
-     * Return the list of TrackerHits for the SeedCandidate
-     * @return List of TrackerHits for the SeedCandidate
-     */
-    public List<TrackerHit> getTrackerHits() {
-        List<TrackerHit> tracker_hits = new ArrayList<TrackerHit>();
-        for (HelicalTrackHit hel_hit : _hits) {
-            tracker_hits.add(hel_hit.getTrackerHit());
-        }
-        return tracker_hits;
-    }
-    
-    /**
      * Return the HelicalTrackFit associated with the SeedCandidate
      * @return HelicalTrackFit associated with the SeedCandidate
      */
CVSspam 0.2.8