java/trunk/tracking/src/main/java/org/hps/recon/tracking/nobfield

--- java/trunk/tracking/src/main/java/org/hps/recon/tracking/nobfield/StraightTrack.java	2014-10-16 21:32:51 UTC (rev 1232)
+++ java/trunk/tracking/src/main/java/org/hps/recon/tracking/nobfield/StraightTrack.java	2014-10-16 21:33:15 UTC (rev 1233)
@@ -1,20 +1,12 @@

 package org.hps.recon.tracking.nobfield;
 
 import hep.physics.matrix.SymmetricMatrix;

-import static java.lang.Math.abs;
-import static java.lang.Math.signum;

 import java.util.ArrayList;
 import java.util.List;

-import org.lcsim.constants.Constants;

 import org.lcsim.event.LCIOParameters;
 import org.lcsim.event.Track;
 import org.lcsim.event.TrackState;
 import org.lcsim.event.TrackerHit;

-import static org.lcsim.event.base.BaseTrack.D0;
-import static org.lcsim.event.base.BaseTrack.OMEGA;
-import static org.lcsim.event.base.BaseTrack.PHI;
-import static org.lcsim.event.base.BaseTrack.TANLAMBDA;
-import static org.lcsim.event.base.BaseTrack.Z0;

 import org.lcsim.event.base.BaseTrackState;
 
 /**

@@ -31,6 +23,9 @@

     protected List<TrackState> _trackStates;
     protected double[] _chi2 = new double[2];
     protected double[] _parameters = new double[5];

+     protected double[] _momentum = new double[3];
+      protected double[] _ref = new double[3];
+    protected int _ndf;

     // Parameter ordering.
     public static final int x0 = LCIOParameters.ParameterName.d0.ordinal();
     public static final int slopeXZ = LCIOParameters.ParameterName.phi0.ordinal();

@@ -139,59 +134,59 @@

 
     @Override
     public int getCharge() {

-        throw new UnsupportedOperationException("StraightTrack...no momentum measured."); //To change body of generated methods, choose Tools | Templates.

+        return -999;

     }
 
     @Override
     public double[] getReferencePoint() {

-        throw new UnsupportedOperationException("Not supported yet."); //To change body of generated methods, choose Tools | Templates.

+        return _ref;

     }
 
     @Override
     public double getReferencePointX() {

-        throw new UnsupportedOperationException("Not supported yet."); //To change body of generated methods, choose Tools | Templates.

+        return _ref[0];

     }
 
     @Override
     public double getReferencePointY() {

-        throw new UnsupportedOperationException("Not supported yet."); //To change body of generated methods, choose Tools | Templates.

+    return _ref[1];

     }
 
     @Override
     public double getReferencePointZ() {

-        throw new UnsupportedOperationException("Not supported yet."); //To change body of generated methods, choose Tools | Templates.

+         return _ref[2];

     }
 
     @Override
     public boolean isReferencePointPCA() {

-        throw new UnsupportedOperationException("Not supported yet."); //To change body of generated methods, choose Tools | Templates.

+        return false;

     }
 
     @Override
     public double[] getMomentum() {

-        throw new UnsupportedOperationException("StraightTrack...no momentum measured."); //To change body of generated methods, choose Tools | Templates.

+        return _momentum;

     }
 
     @Override
     public double getPX() {

-        throw new UnsupportedOperationException("StraightTrack...no momentum measured."); //To change body of generated methods, choose Tools | Templates.

+        return -999;

     }
 
     @Override
     public double getPY() {

-        throw new UnsupportedOperationException("StraightTrack...no momentum measured."); //To change body of generated methods, choose Tools | Templates.

+        return -999;

     }
 
     @Override
     public double getPZ() {

-        throw new UnsupportedOperationException("Not supported yet."); //To change body of generated methods, choose Tools | Templates.

+        return -999;

     }
 
     @Override
     public boolean fitSuccess() {
         throw new UnsupportedOperationException("StraightTrack...no momentum measured."); //To change body of generated methods, choose Tools | Templates.
     }

-

+    

     @Override
     public double getTrackParameter(int i) {
         return _parameters[i];

@@ -227,24 +222,32 @@

 
     @Override
     public int getNDF() {

-        throw new UnsupportedOperationException("Not supported yet."); //To change body of generated methods, choose Tools | Templates.

+        return _ndf;

     }
 

+    public void setNDF(int ndf) {
+        _ndf = ndf;
+    }
+

     @Override
     public double getdEdx() {

-        throw new UnsupportedOperationException("Not supported yet."); //To change body of generated methods, choose Tools | Templates.

+        return -999;

     }
 
     @Override
     public double getdEdxError() {

-        throw new UnsupportedOperationException("Not supported yet."); //To change body of generated methods, choose Tools | Templates.

+        return -999;

     }
 
     @Override
     public double getRadiusOfInnermostHit() {

-        throw new UnsupportedOperationException("Not supported yet."); //To change body of generated methods, choose Tools | Templates.

+        return -999;

     }
 

+//    public TrackDirection getTrackDirection(){
+        
+ //   }
+    

     public String toString() {
         String className = getClass().getName();
         int lastDot = className.lastIndexOf('.');

java/trunk/tracking/src/main/java/org/hps/recon/tracking/nobfield

--- java/trunk/tracking/src/main/java/org/hps/recon/tracking/nobfield/TrackChecker.java	2014-10-16 21:32:51 UTC (rev 1232)
+++ java/trunk/tracking/src/main/java/org/hps/recon/tracking/nobfield/TrackChecker.java	2014-10-16 21:33:15 UTC (rev 1233)
@@ -19,4 +19,9 @@

         return true;
     }
 

+    public boolean checkSeed(StraightTrack trk) {
+
+        return true;
+    }
+

 }

java/trunk/tracking/src/main/java/org/hps/recon/tracking/nobfield

--- java/trunk/tracking/src/main/java/org/hps/recon/tracking/nobfield/TrackCollectionUtilities.java	                        (rev 0)
+++ java/trunk/tracking/src/main/java/org/hps/recon/tracking/nobfield/TrackCollectionUtilities.java	2014-10-16 21:33:15 UTC (rev 1233)
@@ -0,0 +1,85 @@

+package org.hps.recon.tracking.nobfield;
+
+import java.util.ArrayList;
+import java.util.List;
+import org.lcsim.event.Track;
+import org.lcsim.event.TrackerHit;
+
+/**
+ * * Some methods which manipulate track collections in various ways
+ *
+ * @author mgraham -- date created 7/9/2014
+ */
+public class TrackCollectionUtilities {
+
+    public static boolean pruneTrackList(List<Track> tracklist, Track newseed, int nMaxOverlap) {
+//        if(diag!=null) diag.fireMergeStartDiagnostics(newseedlist);
+
+        //  Assume the new seed is better than all duplicates
+        boolean best = true;
+
+        //  Create a list of duplicates that are inferior
+        List<Track> duplist = new ArrayList<Track>();
+
+        //  Loop over all existing seeds
+        for (Track seed : tracklist) {
+            //first, check if they are identical...don't do anything if they are
+            if (seed.equals(newseed))
+                continue;
+
+            //  See if the new seed is considered a duplicate of the current seed        
+            boolean dupe = isDuplicate(newseed, seed, nMaxOverlap);
+
+            if (dupe) {
+
+                //  Check if the new seed is better than the existing seed
+                boolean better = isBetter(newseed, seed);
+
+                if (better)
+
+                    //  If the new seed is better, add the existing seed to the list for deletion
+                    duplist.add(seed);
+                else {
+
+                    //  If the new seed is inferior to an existing seed, leave everything unchanged
+                    best = false;
+                    break;
+                }
+            }
+        }
+     
+
+        return best;
+    }
+
+    public static boolean isDuplicate(Track seed1, Track seed2,int nMaxOverlap) {
+        int nduplicate = 0;
+        for (TrackerHit hit1 : seed1.getTrackerHits())
+            for (TrackerHit hit2 : seed2.getTrackerHits())
+                if (hit1 == hit2) {
+                    nduplicate++;
+                    if (nduplicate > nMaxOverlap)
+                        return true;
+                }
+        return false;
+    }
+
+    public static boolean isBetter(Track newseed, Track oldseed) {
+
+        int hitdif = newseed.getTrackerHits().size() - oldseed.getTrackerHits().size();
+        double chisqdif = newseed.getChi2() - oldseed.getChi2();
+        if (hitdif > 1)
+            return true;
+        if (hitdif == 1) {
+            return true;//for now just keep the longer tracks...
+//            return chisqdif < strategy.getBadHitChisq();
+        }
+        if (hitdif == 0)
+            return chisqdif < 0.;
+        if (hitdif == -1) {
+            return false;
+            //           return chisqdif < -strategy.getBadHitChisq();
+        }
+        return false;
+    }
+}