Print

---

Author: [log in to unmask]
Date: Wed Sep  2 23:52:42 2015
New Revision: 3504

Log:
Set the track type based on the strategy and if it's a GBL track.

Modified:
    java/trunk/tracking/src/main/java/org/hps/recon/tracking/TrackDataDriver.java
    java/trunk/tracking/src/main/java/org/hps/recon/tracking/gbl/MakeGblTracks.java

Modified: java/trunk/tracking/src/main/java/org/hps/recon/tracking/TrackDataDriver.java
 =============================================================================
--- java/trunk/tracking/src/main/java/org/hps/recon/tracking/TrackDataDriver.java	(original)
+++ java/trunk/tracking/src/main/java/org/hps/recon/tracking/TrackDataDriver.java	Wed Sep  2 23:52:42 2015
@@ -118,13 +118,13 @@
                 SeedTrack seedTrack = (SeedTrack) track; 
                 String strategyName = seedTrack.getStrategy().getName();
                
-                // If a TrackType is associated with this strategy, set it.
-                // Otherwise, just move on and stick with the default value
-                // of zero.
-                //TrackType trackType = TrackType.getType(strategyName);
-                //if (trackType != null) { 
-                //    seedTrack.setTrackType(trackType.getType());
-                //}
+                // Check if a StrategyType is associated with this strategy. 
+                // If it is, set the track type.  Otherwise, just move on 
+                // and stick with the default value of zero.
+                StrategyType strategyType = StrategyType.getType(strategyName);
+                if (strategyType != null) { 
+                    seedTrack.setTrackType(TrackType.getType(strategyType));
+                }
                 
                 totalT0 = 0;
                 totalHits = 0;

Modified: java/trunk/tracking/src/main/java/org/hps/recon/tracking/gbl/MakeGblTracks.java
 =============================================================================
--- java/trunk/tracking/src/main/java/org/hps/recon/tracking/gbl/MakeGblTracks.java	(original)
+++ java/trunk/tracking/src/main/java/org/hps/recon/tracking/gbl/MakeGblTracks.java	Wed Sep  2 23:52:42 2015
@@ -5,11 +5,15 @@
 import hep.physics.vec.Hep3Matrix;
 import hep.physics.vec.Hep3Vector;
 import hep.physics.vec.VecOp;
+
 import java.util.ArrayList;
 import java.util.List;
 import java.util.logging.Level;
 import java.util.logging.Logger;
+
 import org.apache.commons.math3.util.Pair;
+import org.hps.recon.tracking.StrategyType;
+import org.hps.recon.tracking.TrackType;
 import org.hps.recon.tracking.gbl.GBLOutput.ClParams;
 import org.hps.recon.tracking.gbl.GBLOutput.PerigeeParams;
 import org.hps.recon.tracking.gbl.matrix.Matrix;
@@ -112,8 +116,13 @@
             //  Set the SeedCandidate this track is based on
             trk.setSeedCandidate(trackseed);
 
-            // Set the track type.
-            trk.setTrackType(seedTrack.getType());
+            // Check if a StrategyType is associated with this strategy.
+            // If it is, set the track type with the GBL flag set to true.
+            // Otherwise, just move on and stick with the default value.
+            StrategyType strategyType = StrategyType.getType(seedTrack.getType());
+            if (strategyType != null) { 
+                trk.setTrackType(TrackType.getType(strategyType, true));
+            }
 
             // Check the track - hook for plugging in external constraint
             //if ((_trackCheck != null) && (! _trackCheck.checkTrack(trk))) continue;