lcsim/src/org/lcsim/contrib/CosminDeaconu

diff -N DefaultPlanarStrategy.java
--- /dev/null	1 Jan 1970 00:00:00 -0000
+++ DefaultPlanarStrategy.java	27 May 2008 21:43:56 -0000	1.1
@@ -0,0 +1,91 @@

+/*
+ * DefaultStrategy.java
+ *
+ * Created on March 29, 2006, 3:45 PM
+ *
+ */
+
+package org.lcsim.contrib.CosminDeaconu;
+
+import org.lcsim.contrib.seedtracker.*;
+import java.util.List;
+import java.util.ArrayList;
+
+import org.lcsim.contrib.seedtracker.SeedLayer.SeedType;
+import org.lcsim.geometry.subdetector.BarrelEndcapFlag;
+
+/**
+ * Define the default strategy to be used by the SeedTracker tracking algorithm.  The default strategy may be
+ * over-ridden by calling the method SeedTracker.putStrategyList.
+ * @author Richard Partridge
+ * @version 1.0
+ */
+public class DefaultPlanarStrategy {
+    private List<SeedStrategy> _strategylist;
+    
+    /** Creates a new instance of DefaultStrategy */
+    public DefaultPlanarStrategy() {
+        _strategylist = new ArrayList();
+        // Barrel only strategies
+//        List<SeedLayer> tv012layers = new ArrayList();
+//        tv012layers.add(new SeedLayer("VertexBarrel", 0, BarrelEndcapFlag.BARREL, SeedType.Seed));
+//        tv012layers.add(new SeedLayer("VertexBarrel", 1, BarrelEndcapFlag.BARREL, SeedType.Seed));
+//        tv012layers.add(new SeedLayer("VertexBarrel", 2, BarrelEndcapFlag.BARREL, SeedType.Seed));
+//        tv012layers.add(new SeedLayer("VertexBarrel", 3, BarrelEndcapFlag.BARREL, SeedType.Confirm));
+//        tv012layers.add(new SeedLayer("VertexBarrel", 4, BarrelEndcapFlag.BARREL, SeedType.Confirm));
+//        tv012layers.add(new SeedLayer("TrackerBarrel", 0, BarrelEndcapFlag.BARREL, SeedType.Extend));
+//        tv012layers.add(new SeedLayer("TrackerBarrel", 1, BarrelEndcapFlag.BARREL, SeedType.Extend));
+//        tv012layers.add(new SeedLayer("TrackerBarrel", 2, BarrelEndcapFlag.BARREL, SeedType.Extend));
+//        tv012layers.add(new SeedLayer("TrackerBarrel", 3, BarrelEndcapFlag.BARREL, SeedType.Extend));
+//        tv012layers.add(new SeedLayer("TrackerBarrel", 4, BarrelEndcapFlag.BARREL, SeedType.Extend));
+        
+//        _strategylist.add(new SeedStrategy("TV012",tv012layers));
+
+        List<SeedLayer> tb345layers = new ArrayList();
+        tb345layers.add(new SeedLayer("SiVertexBarrel", 0, BarrelEndcapFlag.BARREL, SeedType.Extend));
+        tb345layers.add(new SeedLayer("SiVertexBarrel", 1, BarrelEndcapFlag.BARREL, SeedType.Extend));
+        tb345layers.add(new SeedLayer("SiVertexBarrel", 2, BarrelEndcapFlag.BARREL, SeedType.Extend));
+        tb345layers.add(new SeedLayer("SiVertexBarrel", 3, BarrelEndcapFlag.BARREL, SeedType.Extend));
+        tb345layers.add(new SeedLayer("SiVertexBarrel", 4, BarrelEndcapFlag.BARREL, SeedType.Extend));
+        tb345layers.add(new SeedLayer("SiTrackerBarrel", 0, BarrelEndcapFlag.BARREL, SeedType.Extend));
+        tb345layers.add(new SeedLayer("SiTrackerBarrel", 1, BarrelEndcapFlag.BARREL, SeedType.Confirm));
+        tb345layers.add(new SeedLayer("SiTrackerBarrel", 2, BarrelEndcapFlag.BARREL, SeedType.Seed));
+        tb345layers.add(new SeedLayer("SiTrackerBarrel", 3, BarrelEndcapFlag.BARREL, SeedType.Seed));
+        tb345layers.add(new SeedLayer("SiTrackerBarrel", 4, BarrelEndcapFlag.BARREL, SeedType.Seed));
+        SeedStrategy ss  =new SeedStrategy("TB345",tb345layers);
+        ss.putMinHits(7);
+        _strategylist.add(ss);
+        
+        List<BarrelEndcapFlag> belist = new ArrayList();
+        belist.add(BarrelEndcapFlag.ENDCAP_NORTH);
+        belist.add(BarrelEndcapFlag.ENDCAP_SOUTH);
+        
+        for (BarrelEndcapFlag beflag : belist) {
+            List<SeedLayer> td012layers = new ArrayList();
+            td012layers.add(new SeedLayer("TrackerEndcap", 0, beflag, SeedType.Seed));
+            td012layers.add(new SeedLayer("TrackerEndcap", 2, beflag, SeedType.Seed));
+            td012layers.add(new SeedLayer("TrackerEndcap", 4, beflag, SeedType.Seed));
+//            _strategylist.add(new SeedStrategy("TD012"+beflag.toString(),td012layers));
+            
+            List<SeedLayer> tca = new ArrayList();
+            tca.add(new SeedLayer("TrackerBarrel", 0, BarrelEndcapFlag.BARREL, SeedType.Seed));
+            tca.add(new SeedLayer("TrackerBarrel", 1, BarrelEndcapFlag.BARREL, SeedType.Seed));
+            tca.add(new SeedLayer("TrackerEndcap", 4, beflag, SeedType.Seed));
+//            _strategylist.add(new SeedStrategy("TCA"+beflag.toString(),tca));
+            
+            List<SeedLayer> tcb = new ArrayList();
+            tcb.add(new SeedLayer("TrackerBarrel", 0, BarrelEndcapFlag.BARREL, SeedType.Seed));
+            tcb.add(new SeedLayer("TrackerEndcap", 2, beflag, SeedType.Seed));
+            tcb.add(new SeedLayer("TrackerEndcap", 4, beflag, SeedType.Seed));
+//            _strategylist.add(new SeedStrategy("TCB"+beflag.toString(),tcb));
+        }        
+    }
+    
+    /**
+     * Returns the default list of track-finding strategies
+     * @return List of strategies to be used by SeedTracker
+     */
+    public List<SeedStrategy> getStrategyList() {
+        return _strategylist;
+    }
+}

lcsim/src/org/lcsim/contrib/CosminDeaconu

diff -u -r1.1 -r1.2
--- DigiSeedTrackerDriver.java	26 May 2008 04:34:46 -0000	1.1
+++ DigiSeedTrackerDriver.java	27 May 2008 21:43:56 -0000	1.2
@@ -7,7 +7,6 @@

 
 import java.util.List;
 import org.lcsim.contrib.SiStripSim.TrackerHitDriver_User;

-import org.lcsim.contrib.seedtracker.DefaultStrategy;

 import org.lcsim.contrib.seedtracker.SeedTracker;
 import org.lcsim.contrib.seedtracker.diagnostic.SeedTrackerDiagnostics;
 import org.lcsim.contrib.tracking.TrackerHitCheater;

@@ -33,7 +32,7 @@

         hitdriver.addCollection(((TrackerHitDriver_User)driver).getStripHits2DName(),HitType.Digitized);
         hitdriver.addCollection("CheatedVertexBarrelHits",HitType.Smeared); 
         add(hitdriver);

-        SeedTracker st = new SeedTracker(new DefaultStrategy().getStrategyList());

+        SeedTracker st = new SeedTracker(new DefaultPlanarStrategy().getStrategyList());

         st.setDiagnostics(new SeedTrackerDiagnostics());
         add(st);
     }