Commit in hps-java/src/main/java/org/lcsim/hps on MAIN
users/phansson/ParticleHelixProducer.java+1-11.9 -> 1.10
recon/tracking/HPSRawTrackerHitFitterDriver.java+2-21.18 -> 1.19
              /TrackUtils.java+2-21.18 -> 1.19
+5-5
3 modified files
Fixed diamond operator support.

hps-java/src/main/java/org/lcsim/hps/users/phansson
ParticleHelixProducer.java 1.9 -> 1.10
diff -u -r1.9 -r1.10
--- ParticleHelixProducer.java	25 Apr 2013 22:11:14 -0000	1.9
+++ ParticleHelixProducer.java	3 May 2013 23:18:56 -0000	1.10
@@ -139,7 +139,7 @@
 
         //Make new tracks based on the MC particles
         //List<HelicalTrackFit> tracks = new ArrayList<HelicalTrackFit>();
-        List<HPSTrack> tracks = new ArrayList<>();
+        List<HPSTrack> tracks = new ArrayList<HPSTrack>();
 
         if (event.hasCollection(MCParticle.class)) {
             List<MCParticle> mcparticles = event.get(MCParticle.class).get(0);

hps-java/src/main/java/org/lcsim/hps/recon/tracking
HPSRawTrackerHitFitterDriver.java 1.18 -> 1.19
diff -u -r1.18 -r1.19
--- HPSRawTrackerHitFitterDriver.java	19 Apr 2013 00:02:22 -0000	1.18
+++ HPSRawTrackerHitFitterDriver.java	3 May 2013 23:18:56 -0000	1.19
@@ -76,8 +76,8 @@
         if (rawHits == null) {
             throw new RuntimeException("Event is missing SVT hits collection!");
         }
-        List<HPSFittedRawTrackerHit> hits = new ArrayList<>();
-        List<HPSShapeFitParameters> fits = new ArrayList<>();
+        List<HPSFittedRawTrackerHit> hits = new ArrayList<HPSFittedRawTrackerHit>();
+        List<HPSShapeFitParameters> fits = new ArrayList<HPSShapeFitParameters>();
 
         //  Make a fitted hit from this cluster
         for (RawTrackerHit hit : rawHits) {

hps-java/src/main/java/org/lcsim/hps/recon/tracking
TrackUtils.java 1.18 -> 1.19
diff -u -r1.18 -r1.19
--- TrackUtils.java	23 Apr 2013 00:07:04 -0000	1.18
+++ TrackUtils.java	3 May 2013 23:18:56 -0000	1.19
@@ -28,7 +28,7 @@
 /**
  * 
  * @author Omar Moreno <[log in to unmask]>
- * @version $Id: TrackUtils.java,v 1.18 2013/04/23 00:07:04 phansson Exp $
+ * @version $Id: TrackUtils.java,v 1.19 2013/05/03 23:18:56 phansson Exp $
  * TODO: Switch to JLab coordinates
  */
 
@@ -620,7 +620,7 @@
     }
     
     public static int numberOfSharedHits(Track track, List<Track> tracklist) {
-        List<Track> tracks = new ArrayList<>();
+        List<Track> tracks = new ArrayList<Track>();
         //System.out.printf("%d tracks in event\n",tracklist.size());
         //System.out.printf("look for another track with chi2=%f and px=%f \n",track.getChi2(),track.getTrackStates().get(0).getMomentum()[0]);
         for(Track t: tracklist) {
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