Commit in lcsim/src/org/lcsim/recon/cat on MAIN
GarfieldTrack.java+8-21.3 -> 1.4
return an empty list of track states instead of a null pointer

lcsim/src/org/lcsim/recon/cat
GarfieldTrack.java 1.3 -> 1.4
diff -u -r1.3 -r1.4
--- GarfieldTrack.java	18 Jun 2012 23:02:14 -0000	1.3
+++ GarfieldTrack.java	30 Jul 2012 15:35:34 -0000	1.4
@@ -25,7 +25,7 @@
  *
  * @author  E. von Toerne
  * @author  D. Onoprienko
- * @version $Id: GarfieldTrack.java,v 1.3 2012/06/18 23:02:14 jeremy Exp $
+ * @version $Id: GarfieldTrack.java,v 1.4 2012/07/30 15:35:34 grefe Exp $
  */
 public class GarfieldTrack implements Track {
   
@@ -53,6 +53,8 @@
   private MCParticle mcParticle;
   private boolean mcParticleIsKnown;
   
+  private List<TrackState> _trackStates;
+  
   // Indexing array of parameters :
   
   static  int PARA_d0 = 0;
@@ -112,6 +114,7 @@
     nHits=0;
     debugLevel = 0;
     mcParticleIsKnown = false;
+    _trackStates = new ArrayList<TrackState>();
   }
   
   /**
@@ -139,6 +142,7 @@
     nHits=0;
     debugLevel = debugL;
     mcParticleIsKnown = false;
+    _trackStates = new ArrayList<TrackState>();
   }
   
   /**
@@ -212,6 +216,7 @@
     stub = new MipStub(standardTrack.getReferencePoint(), standardTrack.getMomentum(),
             standardTrack.getTrackParameter(2), nHits, isEndcap, 0);
     hasZ = hasZMeasurement();
+    _trackStates = new ArrayList<TrackState>();
   }
   
   /**
@@ -239,6 +244,7 @@
     if (debugLevel >=4) System.out.println("GarfieldTrack created copy of track with nHit="+g.hits.size());
     mcParticleIsKnown = false;
     hasZ = g.hasZ;  // fixed Sep 08 2005, evt
+    _trackStates = g.getTrackStates();
   }
   
   // simple data retriever
@@ -962,7 +968,7 @@
   
   public List<TrackState> getTrackStates()
   {
-      return null;
+      return _trackStates;
   }
 }
 
CVSspam 0.2.12


Use REPLY-ALL to reply to list

To unsubscribe from the LCD-CVS list, click the following link:
https://listserv.slac.stanford.edu/cgi-bin/wa?SUBED1=LCD-CVS&A=1