Commit in lcsim on MAIN
resources/org/lcsim/contrib/seedtracker/strategybuilder/strategies/autogen_100GeV_singleMuon_sid01_planar_tracker.xml+126-861.1 -> 1.2
src/org/lcsim/contrib/seedtracker/StrategyXMLMetadata.java+1-51.1 -> 1.2
src/org/lcsim/contrib/seedtracker/strategybuilder/StrategyBuilder.java+58-171.4 -> 1.5
                                                 /LayerWeight.java+371.3 -> 1.4
                                                 /SubsetScorer.java+31-21.2 -> 1.3
resources/org/lcsim/contrib/seedtracker/strategybuilder/weights/default_weights.xml+70-301.1 -> 1.2
src/org/lcsim/contrib/seedtracker/digiexample/DigiSeedTrackerDriver.java+3-31.5 -> 1.6
+326-143
7 modified files
CD - update to strategy builder stuff... now takes into account adjacency in scoring.

lcsim/resources/org/lcsim/contrib/seedtracker/strategybuilder/strategies
autogen_100GeV_singleMuon_sid01_planar_tracker.xml 1.1 -> 1.2
diff -u -r1.1 -r1.2
--- autogen_100GeV_singleMuon_sid01_planar_tracker.xml	17 Jul 2008 00:52:39 -0000	1.1
+++ autogen_100GeV_singleMuon_sid01_planar_tracker.xml	21 Jul 2008 21:21:11 -0000	1.2
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <StrategyList>
-  <!--Strategy list Autogenerated by Strategy Builder on Wed Jul 16 16:46:32 PDT 2008.-->
+  <!--Strategy list Autogenerated by Strategy Builder on Mon Jul 21 12:40:45 GMT-08:00 2008.-->
   <TargetDetector>sid01_planar_tracker</TargetDetector>
   <Strategy name="AUTOGEN0">
     <!--Cutoffs-->
@@ -12,19 +12,13 @@
     <MaxChisq>100.0</MaxChisq>
     <BadHitChisq>15.0</BadHitChisq>
     <!--Layers-->
-    <Layer type="Seed" layer_number="2" detector_name="SiVertexBarrel" be_flag="BARREL" />
-    <Layer type="Seed" layer_number="1" detector_name="SiTrackerBarrel" be_flag="BARREL" />
-    <Layer type="Seed" layer_number="1" detector_name="SiVertexBarrel" be_flag="BARREL" />
-    <Layer type="Confirm" layer_number="3" detector_name="SiTrackerEndcap" be_flag="ENDCAP_SOUTH" />
-    <Layer type="Extend" layer_number="3" detector_name="SiVertexBarrel" be_flag="BARREL" />
-    <Layer type="Extend" layer_number="4" detector_name="SiVertexEndcap" be_flag="ENDCAP_SOUTH" />
-    <Layer type="Extend" layer_number="4" detector_name="SiTrackerEndcap" be_flag="ENDCAP_SOUTH" />
-    <Layer type="Extend" layer_number="2" detector_name="SiTrackerEndcap" be_flag="ENDCAP_SOUTH" />
-    <Layer type="Extend" layer_number="1" detector_name="SiVertexEndcap" be_flag="ENDCAP_SOUTH" />
-    <Layer type="Extend" layer_number="1" detector_name="SiTrackerForward" be_flag="ENDCAP_SOUTH" />
-    <Layer type="Extend" layer_number="3" detector_name="SiVertexEndcap" be_flag="ENDCAP_SOUTH" />
-    <Layer type="Extend" layer_number="1" detector_name="SiTrackerEndcap" be_flag="ENDCAP_SOUTH" />
-    <Layer type="Extend" layer_number="2" detector_name="SiVertexEndcap" be_flag="ENDCAP_SOUTH" />
+    <Layer type="Seed" layer_number="1" detector_name="SiTrackerForward" be_flag="ENDCAP_NORTH" />
+    <Layer type="Seed" layer_number="2" detector_name="SiTrackerForward" be_flag="ENDCAP_NORTH" />
+    <Layer type="Seed" layer_number="4" detector_name="SiVertexEndcap" be_flag="ENDCAP_NORTH" />
+    <Layer type="Confirm" layer_number="3" detector_name="SiVertexEndcap" be_flag="ENDCAP_NORTH" />
+    <Layer type="Extend" layer_number="3" detector_name="SiTrackerForward" be_flag="ENDCAP_NORTH" />
+    <Layer type="Extend" layer_number="3" detector_name="SiTrackerEndcap" be_flag="ENDCAP_NORTH" />
+    <Layer type="Extend" layer_number="4" detector_name="SiTrackerEndcap" be_flag="ENDCAP_NORTH" />
   </Strategy>
   <Strategy name="AUTOGEN1">
     <!--Cutoffs-->
@@ -36,18 +30,25 @@
     <MaxChisq>100.0</MaxChisq>
     <BadHitChisq>15.0</BadHitChisq>
     <!--Layers-->
-    <Layer type="Seed" layer_number="1" detector_name="SiVertexBarrel" be_flag="BARREL" />
-    <Layer type="Seed" layer_number="4" detector_name="SiTrackerEndcap" be_flag="ENDCAP_SOUTH" />
-    <Layer type="Seed" layer_number="2" detector_name="SiTrackerEndcap" be_flag="ENDCAP_SOUTH" />
-    <Layer type="Confirm" layer_number="3" detector_name="SiTrackerEndcap" be_flag="ENDCAP_SOUTH" />
-    <Layer type="Extend" layer_number="2" detector_name="SiVertexBarrel" be_flag="BARREL" />
-    <Layer type="Extend" layer_number="4" detector_name="SiVertexEndcap" be_flag="ENDCAP_SOUTH" />
-    <Layer type="Extend" layer_number="1" detector_name="SiTrackerForward" be_flag="ENDCAP_SOUTH" />
+    <Layer type="Seed" layer_number="4" detector_name="SiTrackerBarrel" be_flag="BARREL" />
+    <Layer type="Seed" layer_number="3" detector_name="SiTrackerBarrel" be_flag="BARREL" />
+    <Layer type="Seed" layer_number="2" detector_name="SiTrackerBarrel" be_flag="BARREL" />
+    <Layer type="Confirm" layer_number="1" detector_name="SiTrackerBarrel" be_flag="BARREL" />
+    <Layer type="Extend" layer_number="1" detector_name="SiTrackerForward" be_flag="ENDCAP_NORTH" />
+    <Layer type="Extend" layer_number="2" detector_name="SiVertexEndcap" be_flag="ENDCAP_NORTH" />
     <Layer type="Extend" layer_number="1" detector_name="SiVertexEndcap" be_flag="ENDCAP_SOUTH" />
-    <Layer type="Extend" layer_number="3" detector_name="SiVertexEndcap" be_flag="ENDCAP_SOUTH" />
-    <Layer type="Extend" layer_number="1" detector_name="SiTrackerEndcap" be_flag="ENDCAP_SOUTH" />
     <Layer type="Extend" layer_number="2" detector_name="SiVertexEndcap" be_flag="ENDCAP_SOUTH" />
-    <Layer type="Extend" layer_number="2" detector_name="SiTrackerForward" be_flag="ENDCAP_SOUTH" />
+    <Layer type="Extend" layer_number="4" detector_name="SiTrackerEndcap" be_flag="ENDCAP_NORTH" />
+    <Layer type="Extend" layer_number="1" detector_name="SiVertexEndcap" be_flag="ENDCAP_NORTH" />
+    <Layer type="Extend" layer_number="3" detector_name="SiTrackerEndcap" be_flag="ENDCAP_NORTH" />
+    <Layer type="Extend" layer_number="2" detector_name="SiVertexBarrel" be_flag="BARREL" />
+    <Layer type="Extend" layer_number="3" detector_name="SiVertexBarrel" be_flag="BARREL" />
+    <Layer type="Extend" layer_number="1" detector_name="SiVertexBarrel" be_flag="BARREL" />
+    <Layer type="Extend" layer_number="4" detector_name="SiTrackerEndcap" be_flag="ENDCAP_SOUTH" />
+    <Layer type="Extend" layer_number="4" detector_name="SiVertexBarrel" be_flag="BARREL" />
+    <Layer type="Extend" layer_number="5" detector_name="SiVertexBarrel" be_flag="BARREL" />
+    <Layer type="Extend" layer_number="1" detector_name="SiTrackerForward" be_flag="ENDCAP_SOUTH" />
+    <Layer type="Extend" layer_number="3" detector_name="SiTrackerEndcap" be_flag="ENDCAP_SOUTH" />
   </Strategy>
   <Strategy name="AUTOGEN2">
     <!--Cutoffs-->
@@ -59,17 +60,16 @@
     <MaxChisq>100.0</MaxChisq>
     <BadHitChisq>15.0</BadHitChisq>
     <!--Layers-->
-    <Layer type="Seed" layer_number="1" detector_name="SiVertexBarrel" be_flag="BARREL" />
-    <Layer type="Seed" layer_number="2" detector_name="SiTrackerEndcap" be_flag="ENDCAP_NORTH" />
-    <Layer type="Seed" layer_number="3" detector_name="SiTrackerEndcap" be_flag="ENDCAP_NORTH" />
-    <Layer type="Confirm" layer_number="4" detector_name="SiTrackerEndcap" be_flag="ENDCAP_NORTH" />
-    <Layer type="Extend" layer_number="1" detector_name="SiTrackerForward" be_flag="ENDCAP_NORTH" />
-    <Layer type="Extend" layer_number="1" detector_name="SiTrackerEndcap" be_flag="ENDCAP_NORTH" />
+    <Layer type="Seed" layer_number="1" detector_name="SiTrackerForward" be_flag="ENDCAP_NORTH" />
+    <Layer type="Seed" layer_number="4" detector_name="SiVertexEndcap" be_flag="ENDCAP_NORTH" />
+    <Layer type="Seed" layer_number="2" detector_name="SiVertexEndcap" be_flag="ENDCAP_NORTH" />
+    <Layer type="Confirm" layer_number="3" detector_name="SiVertexEndcap" be_flag="ENDCAP_NORTH" />
     <Layer type="Extend" layer_number="2" detector_name="SiTrackerForward" be_flag="ENDCAP_NORTH" />
-    <Layer type="Extend" layer_number="2" detector_name="SiVertexBarrel" be_flag="BARREL" />
-    <Layer type="Extend" layer_number="2" detector_name="SiVertexEndcap" be_flag="ENDCAP_NORTH" />
-    <Layer type="Extend" layer_number="4" detector_name="SiVertexEndcap" be_flag="ENDCAP_NORTH" />
-    <Layer type="Extend" layer_number="3" detector_name="SiVertexEndcap" be_flag="ENDCAP_NORTH" />
+    <Layer type="Extend" layer_number="2" detector_name="SiTrackerEndcap" be_flag="ENDCAP_NORTH" />
+    <Layer type="Extend" layer_number="3" detector_name="SiTrackerForward" be_flag="ENDCAP_NORTH" />
+    <Layer type="Extend" layer_number="3" detector_name="SiTrackerEndcap" be_flag="ENDCAP_NORTH" />
+    <Layer type="Extend" layer_number="1" detector_name="SiVertexBarrel" be_flag="BARREL" />
+    <Layer type="Extend" layer_number="4" detector_name="SiTrackerEndcap" be_flag="ENDCAP_NORTH" />
     <Layer type="Extend" layer_number="1" detector_name="SiVertexEndcap" be_flag="ENDCAP_NORTH" />
   </Strategy>
   <Strategy name="AUTOGEN3">
@@ -82,17 +82,20 @@
     <MaxChisq>100.0</MaxChisq>
     <BadHitChisq>15.0</BadHitChisq>
     <!--Layers-->
-    <Layer type="Seed" layer_number="3" detector_name="SiTrackerEndcap" be_flag="ENDCAP_NORTH" />
-    <Layer type="Seed" layer_number="4" detector_name="SiTrackerEndcap" be_flag="ENDCAP_NORTH" />
-    <Layer type="Seed" layer_number="1" detector_name="SiTrackerForward" be_flag="ENDCAP_NORTH" />
-    <Layer type="Confirm" layer_number="2" detector_name="SiTrackerForward" be_flag="ENDCAP_NORTH" />
-    <Layer type="Extend" layer_number="1" detector_name="SiTrackerEndcap" be_flag="ENDCAP_NORTH" />
-    <Layer type="Extend" layer_number="2" detector_name="SiTrackerEndcap" be_flag="ENDCAP_NORTH" />
-    <Layer type="Extend" layer_number="3" detector_name="SiTrackerForward" be_flag="ENDCAP_NORTH" />
-    <Layer type="Extend" layer_number="2" detector_name="SiVertexEndcap" be_flag="ENDCAP_NORTH" />
-    <Layer type="Extend" layer_number="4" detector_name="SiVertexEndcap" be_flag="ENDCAP_NORTH" />
-    <Layer type="Extend" layer_number="3" detector_name="SiVertexEndcap" be_flag="ENDCAP_NORTH" />
-    <Layer type="Extend" layer_number="1" detector_name="SiVertexEndcap" be_flag="ENDCAP_NORTH" />
+    <Layer type="Seed" layer_number="1" detector_name="SiVertexBarrel" be_flag="BARREL" />
+    <Layer type="Seed" layer_number="2" detector_name="SiVertexBarrel" be_flag="BARREL" />
+    <Layer type="Seed" layer_number="3" detector_name="SiVertexBarrel" be_flag="BARREL" />
+    <Layer type="Confirm" layer_number="1" detector_name="SiVertexEndcap" be_flag="ENDCAP_SOUTH" />
+    <Layer type="Extend" layer_number="1" detector_name="SiTrackerBarrel" be_flag="BARREL" />
+    <Layer type="Extend" layer_number="3" detector_name="SiTrackerBarrel" be_flag="BARREL" />
+    <Layer type="Extend" layer_number="2" detector_name="SiTrackerBarrel" be_flag="BARREL" />
+    <Layer type="Extend" layer_number="4" detector_name="SiTrackerEndcap" be_flag="ENDCAP_SOUTH" />
+    <Layer type="Extend" layer_number="4" detector_name="SiVertexBarrel" be_flag="BARREL" />
+    <Layer type="Extend" layer_number="1" detector_name="SiTrackerForward" be_flag="ENDCAP_SOUTH" />
+    <Layer type="Extend" layer_number="2" detector_name="SiTrackerEndcap" be_flag="ENDCAP_SOUTH" />
+    <Layer type="Extend" layer_number="3" detector_name="SiTrackerEndcap" be_flag="ENDCAP_SOUTH" />
+    <Layer type="Extend" layer_number="3" detector_name="SiVertexEndcap" be_flag="ENDCAP_SOUTH" />
+    <Layer type="Extend" layer_number="2" detector_name="SiVertexEndcap" be_flag="ENDCAP_SOUTH" />
   </Strategy>
   <Strategy name="AUTOGEN4">
     <!--Cutoffs-->
@@ -104,16 +107,35 @@
     <MaxChisq>100.0</MaxChisq>
     <BadHitChisq>15.0</BadHitChisq>
     <!--Layers-->
-    <Layer type="Seed" layer_number="3" detector_name="SiTrackerBarrel" be_flag="BARREL" />
+    <Layer type="Seed" layer_number="1" detector_name="SiTrackerForward" be_flag="ENDCAP_SOUTH" />
+    <Layer type="Seed" layer_number="2" detector_name="SiTrackerForward" be_flag="ENDCAP_SOUTH" />
+    <Layer type="Seed" layer_number="4" detector_name="SiVertexEndcap" be_flag="ENDCAP_SOUTH" />
+    <Layer type="Confirm" layer_number="3" detector_name="SiVertexEndcap" be_flag="ENDCAP_SOUTH" />
+    <Layer type="Extend" layer_number="4" detector_name="SiTrackerEndcap" be_flag="ENDCAP_SOUTH" />
+    <Layer type="Extend" layer_number="3" detector_name="SiTrackerEndcap" be_flag="ENDCAP_SOUTH" />
+    <Layer type="Extend" layer_number="3" detector_name="SiTrackerForward" be_flag="ENDCAP_SOUTH" />
+  </Strategy>
+  <Strategy name="AUTOGEN5">
+    <!--Cutoffs-->
+    <MinPT>1.0</MinPT>
+    <MinHits>7</MinHits>
+    <MinConfirm>1</MinConfirm>
+    <MaxDCA>10.0</MaxDCA>
+    <MaxZ0>10.0</MaxZ0>
+    <MaxChisq>100.0</MaxChisq>
+    <BadHitChisq>15.0</BadHitChisq>
+    <!--Layers-->
     <Layer type="Seed" layer_number="5" detector_name="SiTrackerBarrel" be_flag="BARREL" />
     <Layer type="Seed" layer_number="4" detector_name="SiTrackerBarrel" be_flag="BARREL" />
+    <Layer type="Seed" layer_number="3" detector_name="SiTrackerBarrel" be_flag="BARREL" />
     <Layer type="Confirm" layer_number="2" detector_name="SiTrackerBarrel" be_flag="BARREL" />
     <Layer type="Extend" layer_number="1" detector_name="SiTrackerForward" be_flag="ENDCAP_NORTH" />
     <Layer type="Extend" layer_number="1" detector_name="SiVertexEndcap" be_flag="ENDCAP_SOUTH" />
     <Layer type="Extend" layer_number="2" detector_name="SiVertexEndcap" be_flag="ENDCAP_NORTH" />
     <Layer type="Extend" layer_number="2" detector_name="SiVertexEndcap" be_flag="ENDCAP_SOUTH" />
-    <Layer type="Extend" layer_number="4" detector_name="SiTrackerEndcap" be_flag="ENDCAP_NORTH" />
     <Layer type="Extend" layer_number="1" detector_name="SiVertexEndcap" be_flag="ENDCAP_NORTH" />
+    <Layer type="Extend" layer_number="4" detector_name="SiTrackerEndcap" be_flag="ENDCAP_NORTH" />
+    <Layer type="Extend" layer_number="3" detector_name="SiTrackerEndcap" be_flag="ENDCAP_NORTH" />
     <Layer type="Extend" layer_number="2" detector_name="SiVertexBarrel" be_flag="BARREL" />
     <Layer type="Extend" layer_number="1" detector_name="SiTrackerBarrel" be_flag="BARREL" />
     <Layer type="Extend" layer_number="3" detector_name="SiVertexBarrel" be_flag="BARREL" />
@@ -123,7 +145,33 @@
     <Layer type="Extend" layer_number="5" detector_name="SiVertexBarrel" be_flag="BARREL" />
     <Layer type="Extend" layer_number="1" detector_name="SiTrackerForward" be_flag="ENDCAP_SOUTH" />
   </Strategy>
-  <Strategy name="AUTOGEN5">
+  <Strategy name="AUTOGEN6">
+    <!--Cutoffs-->
+    <MinPT>1.0</MinPT>
+    <MinHits>7</MinHits>
+    <MinConfirm>1</MinConfirm>
+    <MaxDCA>10.0</MaxDCA>
+    <MaxZ0>10.0</MaxZ0>
+    <MaxChisq>100.0</MaxChisq>
+    <BadHitChisq>15.0</BadHitChisq>
+    <!--Layers-->
+    <Layer type="Seed" layer_number="4" detector_name="SiTrackerEndcap" be_flag="ENDCAP_NORTH" />
+    <Layer type="Seed" layer_number="3" detector_name="SiTrackerEndcap" be_flag="ENDCAP_NORTH" />
+    <Layer type="Seed" layer_number="2" detector_name="SiTrackerEndcap" be_flag="ENDCAP_NORTH" />
+    <Layer type="Confirm" layer_number="1" detector_name="SiTrackerEndcap" be_flag="ENDCAP_NORTH" />
+    <Layer type="Extend" layer_number="1" detector_name="SiTrackerForward" be_flag="ENDCAP_NORTH" />
+    <Layer type="Extend" layer_number="2" detector_name="SiTrackerForward" be_flag="ENDCAP_NORTH" />
+    <Layer type="Extend" layer_number="2" detector_name="SiVertexBarrel" be_flag="BARREL" />
+    <Layer type="Extend" layer_number="1" detector_name="SiTrackerBarrel" be_flag="BARREL" />
+    <Layer type="Extend" layer_number="3" detector_name="SiVertexBarrel" be_flag="BARREL" />
+    <Layer type="Extend" layer_number="1" detector_name="SiVertexBarrel" be_flag="BARREL" />
+    <Layer type="Extend" layer_number="2" detector_name="SiTrackerBarrel" be_flag="BARREL" />
+    <Layer type="Extend" layer_number="2" detector_name="SiVertexEndcap" be_flag="ENDCAP_NORTH" />
+    <Layer type="Extend" layer_number="4" detector_name="SiVertexEndcap" be_flag="ENDCAP_NORTH" />
+    <Layer type="Extend" layer_number="3" detector_name="SiVertexEndcap" be_flag="ENDCAP_NORTH" />
+    <Layer type="Extend" layer_number="1" detector_name="SiVertexEndcap" be_flag="ENDCAP_NORTH" />
+  </Strategy>
+  <Strategy name="AUTOGEN7">
     <!--Cutoffs-->
     <MinPT>1.0</MinPT>
     <MinHits>7</MinHits>
@@ -135,17 +183,21 @@
     <!--Layers-->
     <Layer type="Seed" layer_number="4" detector_name="SiTrackerEndcap" be_flag="ENDCAP_SOUTH" />
     <Layer type="Seed" layer_number="3" detector_name="SiTrackerEndcap" be_flag="ENDCAP_SOUTH" />
-    <Layer type="Seed" layer_number="1" detector_name="SiTrackerForward" be_flag="ENDCAP_SOUTH" />
-    <Layer type="Confirm" layer_number="2" detector_name="SiTrackerForward" be_flag="ENDCAP_SOUTH" />
+    <Layer type="Seed" layer_number="2" detector_name="SiTrackerEndcap" be_flag="ENDCAP_SOUTH" />
+    <Layer type="Confirm" layer_number="1" detector_name="SiTrackerEndcap" be_flag="ENDCAP_SOUTH" />
+    <Layer type="Extend" layer_number="2" detector_name="SiVertexBarrel" be_flag="BARREL" />
+    <Layer type="Extend" layer_number="1" detector_name="SiTrackerBarrel" be_flag="BARREL" />
+    <Layer type="Extend" layer_number="3" detector_name="SiVertexBarrel" be_flag="BARREL" />
+    <Layer type="Extend" layer_number="1" detector_name="SiVertexBarrel" be_flag="BARREL" />
+    <Layer type="Extend" layer_number="2" detector_name="SiTrackerBarrel" be_flag="BARREL" />
     <Layer type="Extend" layer_number="4" detector_name="SiVertexEndcap" be_flag="ENDCAP_SOUTH" />
-    <Layer type="Extend" layer_number="2" detector_name="SiTrackerEndcap" be_flag="ENDCAP_SOUTH" />
     <Layer type="Extend" layer_number="1" detector_name="SiVertexEndcap" be_flag="ENDCAP_SOUTH" />
+    <Layer type="Extend" layer_number="1" detector_name="SiTrackerForward" be_flag="ENDCAP_SOUTH" />
     <Layer type="Extend" layer_number="3" detector_name="SiVertexEndcap" be_flag="ENDCAP_SOUTH" />
-    <Layer type="Extend" layer_number="3" detector_name="SiTrackerForward" be_flag="ENDCAP_SOUTH" />
     <Layer type="Extend" layer_number="2" detector_name="SiVertexEndcap" be_flag="ENDCAP_SOUTH" />
-    <Layer type="Extend" layer_number="1" detector_name="SiTrackerEndcap" be_flag="ENDCAP_SOUTH" />
+    <Layer type="Extend" layer_number="2" detector_name="SiTrackerForward" be_flag="ENDCAP_SOUTH" />
   </Strategy>
-  <Strategy name="AUTOGEN6">
+  <Strategy name="AUTOGEN8">
     <!--Cutoffs-->
     <MinPT>1.0</MinPT>
     <MinHits>7</MinHits>
@@ -155,31 +207,21 @@
     <MaxChisq>100.0</MaxChisq>
     <BadHitChisq>15.0</BadHitChisq>
     <!--Layers-->
-    <Layer type="Seed" layer_number="2" detector_name="SiTrackerBarrel" be_flag="BARREL" />
+    <Layer type="Seed" layer_number="1" detector_name="SiVertexBarrel" be_flag="BARREL" />
     <Layer type="Seed" layer_number="2" detector_name="SiVertexBarrel" be_flag="BARREL" />
-    <Layer type="Seed" layer_number="1" detector_name="SiTrackerBarrel" be_flag="BARREL" />
-    <Layer type="Confirm" layer_number="1" detector_name="SiVertexBarrel" be_flag="BARREL" />
+    <Layer type="Seed" layer_number="3" detector_name="SiVertexBarrel" be_flag="BARREL" />
+    <Layer type="Confirm" layer_number="1" detector_name="SiVertexEndcap" be_flag="ENDCAP_NORTH" />
     <Layer type="Extend" layer_number="1" detector_name="SiTrackerForward" be_flag="ENDCAP_NORTH" />
-    <Layer type="Extend" layer_number="2" detector_name="SiVertexEndcap" be_flag="ENDCAP_NORTH" />
-    <Layer type="Extend" layer_number="1" detector_name="SiVertexEndcap" be_flag="ENDCAP_SOUTH" />
-    <Layer type="Extend" layer_number="3" detector_name="SiVertexEndcap" be_flag="ENDCAP_NORTH" />
-    <Layer type="Extend" layer_number="3" detector_name="SiVertexEndcap" be_flag="ENDCAP_SOUTH" />
-    <Layer type="Extend" layer_number="4" detector_name="SiTrackerEndcap" be_flag="ENDCAP_NORTH" />
-    <Layer type="Extend" layer_number="1" detector_name="SiVertexEndcap" be_flag="ENDCAP_NORTH" />
-    <Layer type="Extend" layer_number="2" detector_name="SiVertexEndcap" be_flag="ENDCAP_SOUTH" />
-    <Layer type="Extend" layer_number="1" detector_name="SiTrackerEndcap" be_flag="ENDCAP_NORTH" />
     <Layer type="Extend" layer_number="2" detector_name="SiTrackerEndcap" be_flag="ENDCAP_NORTH" />
     <Layer type="Extend" layer_number="3" detector_name="SiTrackerEndcap" be_flag="ENDCAP_NORTH" />
-    <Layer type="Extend" layer_number="3" detector_name="SiVertexBarrel" be_flag="BARREL" />
+    <Layer type="Extend" layer_number="1" detector_name="SiTrackerBarrel" be_flag="BARREL" />
     <Layer type="Extend" layer_number="3" detector_name="SiTrackerBarrel" be_flag="BARREL" />
-    <Layer type="Extend" layer_number="4" detector_name="SiTrackerBarrel" be_flag="BARREL" />
-    <Layer type="Extend" layer_number="4" detector_name="SiTrackerEndcap" be_flag="ENDCAP_SOUTH" />
-    <Layer type="Extend" layer_number="1" detector_name="SiTrackerForward" be_flag="ENDCAP_SOUTH" />
-    <Layer type="Extend" layer_number="2" detector_name="SiTrackerEndcap" be_flag="ENDCAP_SOUTH" />
-    <Layer type="Extend" layer_number="3" detector_name="SiTrackerEndcap" be_flag="ENDCAP_SOUTH" />
-    <Layer type="Extend" layer_number="1" detector_name="SiTrackerEndcap" be_flag="ENDCAP_SOUTH" />
+    <Layer type="Extend" layer_number="2" detector_name="SiTrackerBarrel" be_flag="BARREL" />
+    <Layer type="Extend" layer_number="2" detector_name="SiVertexEndcap" be_flag="ENDCAP_NORTH" />
+    <Layer type="Extend" layer_number="3" detector_name="SiVertexEndcap" be_flag="ENDCAP_NORTH" />
+    <Layer type="Extend" layer_number="4" detector_name="SiTrackerEndcap" be_flag="ENDCAP_NORTH" />
   </Strategy>
-  <Strategy name="AUTOGEN7">
+  <Strategy name="AUTOGEN9">
     <!--Cutoffs-->
     <MinPT>1.0</MinPT>
     <MinHits>7</MinHits>
@@ -189,19 +231,17 @@
     <MaxChisq>100.0</MaxChisq>
     <BadHitChisq>15.0</BadHitChisq>
     <!--Layers-->
-    <Layer type="Seed" layer_number="2" detector_name="SiVertexBarrel" be_flag="BARREL" />
-    <Layer type="Seed" layer_number="1" detector_name="SiTrackerBarrel" be_flag="BARREL" />
-    <Layer type="Seed" layer_number="1" detector_name="SiVertexBarrel" be_flag="BARREL" />
-    <Layer type="Confirm" layer_number="3" detector_name="SiTrackerEndcap" be_flag="ENDCAP_NORTH" />
-    <Layer type="Extend" layer_number="1" detector_name="SiTrackerForward" be_flag="ENDCAP_NORTH" />
-    <Layer type="Extend" layer_number="1" detector_name="SiTrackerEndcap" be_flag="ENDCAP_NORTH" />
-    <Layer type="Extend" layer_number="2" detector_name="SiTrackerEndcap" be_flag="ENDCAP_NORTH" />
-    <Layer type="Extend" layer_number="3" detector_name="SiVertexBarrel" be_flag="BARREL" />
-    <Layer type="Extend" layer_number="2" detector_name="SiVertexEndcap" be_flag="ENDCAP_NORTH" />
-    <Layer type="Extend" layer_number="4" detector_name="SiVertexEndcap" be_flag="ENDCAP_NORTH" />
-    <Layer type="Extend" layer_number="3" detector_name="SiVertexEndcap" be_flag="ENDCAP_NORTH" />
-    <Layer type="Extend" layer_number="1" detector_name="SiVertexEndcap" be_flag="ENDCAP_NORTH" />
-    <Layer type="Extend" layer_number="4" detector_name="SiTrackerEndcap" be_flag="ENDCAP_NORTH" />
+    <Layer type="Seed" layer_number="1" detector_name="SiTrackerForward" be_flag="ENDCAP_SOUTH" />
+    <Layer type="Seed" layer_number="4" detector_name="SiVertexEndcap" be_flag="ENDCAP_SOUTH" />
+    <Layer type="Seed" layer_number="3" detector_name="SiVertexEndcap" be_flag="ENDCAP_SOUTH" />
+    <Layer type="Confirm" layer_number="2" detector_name="SiVertexEndcap" be_flag="ENDCAP_SOUTH" />
+    <Layer type="Extend" layer_number="1" detector_name="SiVertexBarrel" be_flag="BARREL" />
+    <Layer type="Extend" layer_number="4" detector_name="SiTrackerEndcap" be_flag="ENDCAP_SOUTH" />
+    <Layer type="Extend" layer_number="1" detector_name="SiVertexEndcap" be_flag="ENDCAP_SOUTH" />
+    <Layer type="Extend" layer_number="2" detector_name="SiTrackerEndcap" be_flag="ENDCAP_SOUTH" />
+    <Layer type="Extend" layer_number="3" detector_name="SiTrackerEndcap" be_flag="ENDCAP_SOUTH" />
+    <Layer type="Extend" layer_number="3" detector_name="SiTrackerForward" be_flag="ENDCAP_SOUTH" />
+    <Layer type="Extend" layer_number="2" detector_name="SiTrackerForward" be_flag="ENDCAP_SOUTH" />
   </Strategy>
 </StrategyList>
 

lcsim/src/org/lcsim/contrib/seedtracker
StrategyXMLMetadata.java 1.1 -> 1.2
diff -u -r1.1 -r1.2
--- StrategyXMLMetadata.java	17 Jul 2008 00:52:39 -0000	1.1
+++ StrategyXMLMetadata.java	21 Jul 2008 21:21:11 -0000	1.2
@@ -5,12 +5,8 @@
 
 package org.lcsim.contrib.seedtracker;
 
-import java.util.HashMap;
-import java.util.Map;
-import org.jdom.Element;
-
 /**
- *
+ * 
  * @author cozzy
  */
 public class StrategyXMLMetadata {

lcsim/src/org/lcsim/contrib/seedtracker/strategybuilder
StrategyBuilder.java 1.4 -> 1.5
diff -u -r1.4 -r1.5
--- StrategyBuilder.java	17 Jul 2008 19:52:01 -0000	1.4
+++ StrategyBuilder.java	21 Jul 2008 21:21:12 -0000	1.5
@@ -13,6 +13,7 @@
 import java.util.HashMap;
 import java.util.HashSet;
 import java.util.Iterator;
+import java.util.LinkedList;
 import java.util.List;
 import java.util.Map;
 import java.util.Set;
@@ -61,7 +62,7 @@
     private List<Set<DumbLayer>> setlist = new ArrayList<Set<DumbLayer>>();
     private String detectorName; 
     private IParticleFilter filter; 
-    
+    private List<Set<DumbLayer>> adjacentlist = new ArrayList<Set<DumbLayer>>(); 
     
     @Override 
     protected void startOfData(){
@@ -71,6 +72,11 @@
         }
     }
     
+    
+    
+    //In the process step, we build two maps lists of sets:
+    //      The set list is a list of the sets of layers hit by MCParticles hitting over 7 layers
+    //      The adjacence list is a list of a sets that are determined to be adjacent based on MCParticle trajectory
     @Override
     protected void process(EventHeader event){
 
@@ -82,12 +88,9 @@
         
         //Build MC Map from SimTrackerHits
         Map<MCParticle, List<SimTrackerHit>> mcmap = new HashMap<MCParticle, List<SimTrackerHit>>(); 
-        
-//        List<HelicalTrackHit> allhits = event.get(HelicalTrackHit.class, "HelicalTrackHits");     
-        
         List<SimTrackerHit> allhits = new ArrayList<SimTrackerHit>(); 
         for (List<SimTrackerHit> l : event.get(SimTrackerHit.class)) allhits.addAll(l); 
-        
+       
         for (SimTrackerHit h : allhits){
             
                 MCParticle p = h.getMCParticle(); 
@@ -110,21 +113,59 @@
             }
         }
         
-        //Build and add layer sets
+        //Build and add layer sets, as well as adjacent sets
         for(List<SimTrackerHit> l : mcmap.values()) {
             Set<DumbLayer> set = new HashSet<DumbLayer>(); 
+            
+            //sort by time, which allows creation of adjacent sets. 
+            Collections.sort(l, new Comparator() {
+
+                public int compare(Object o1, Object o2) {
+                    SimTrackerHit h1 = (SimTrackerHit) o1; 
+                    SimTrackerHit h2 = (SimTrackerHit) o2; 
+                    return Double.compare(h1.getTime(), h2.getTime()); 
+                }
+            });
+            
+            //this will store all the working adjacent sets
+            LinkedList<Set<DumbLayer>> tempAdjacentLayersList = new LinkedList<Set<DumbLayer>>(); 
+            
+            
             for (SimTrackerHit h : l) {
-                 IDetectorElementContainer cont = DetectorElementStore.getInstance().find(h.getIdentifier());
-                 if(cont.isEmpty()) continue; 
-                 IDetectorElement de = cont.get(0); 
-                 String detname = ID.getName(de);
-                 int lyr = ID.getLayer(de);
-                 BarrelEndcapFlag be = ID.getBarrelEndcapFlag(de); 
-                 if (divideByTwoFlag && be.isEndcap() && detname.indexOf("Tracker")>0){
-                     lyr/=2;  // sid01 doubles up on layer numbering in the endcap. 
-                 }
-                set.add(new DumbLayer(detname, lyr, be));
+                IDetectorElementContainer cont = DetectorElementStore.getInstance().find(h.getIdentifier());
+                if(cont.isEmpty()) continue; 
+                IDetectorElement de = cont.get(0); 
+                String detname = ID.getName(de);
+                int lyr = ID.getLayer(de);
+                BarrelEndcapFlag be = ID.getBarrelEndcapFlag(de); 
+                if (divideByTwoFlag && be.isEndcap() && detname.indexOf("Tracker")>0){
+                 lyr/=2;  // sid01 doubles up on layer numbering in the endcap. 
+                }
+
+                DumbLayer dl = new DumbLayer(detname, lyr, be); 
+                set.add(dl);
+                
+                //create a new adjacent set that starts with this layer if none already exists
+                //(This is necessary because of the doubling of SimTrackerHits in the tracker endcap)
+                if (tempAdjacentLayersList.isEmpty() || !tempAdjacentLayersList.getLast().contains(dl)) {
+                    Set<DumbLayer> adjacentLayers = new HashSet<DumbLayer>(); 
+                    tempAdjacentLayersList.addLast(adjacentLayers);
+                }
+                
+                
+                //see which adjacent sets already have enough layers, and add those to the list
+                Iterator<Set<DumbLayer>> it = tempAdjacentLayersList.iterator(); 
+                while (it.hasNext()) {
+                    Set<DumbLayer> s = it.next(); 
+                    s.add(dl);
+                    if (s.size() == confirm_layers + seed_layers) {
+                        adjacentlist.add(s); 
+                        it.remove(); 
+                    }
+                }
+
             }
+            
             //Ensure layer set has minimum number of layers
             if (set.size() >= min_layers)
                 setlist.add(set); 
@@ -164,7 +205,7 @@
          }
         
         //Generate the scorer and assign its weighter
-        SubsetScorer scorer = new SubsetScorer(setlist); 
+        SubsetScorer scorer = new SubsetScorer(setlist,adjacentlist); 
         scorer.setLayerWeight(weighter); 
         
         //Generate all possible subsets of the right size of allLayers

lcsim/src/org/lcsim/contrib/seedtracker/strategybuilder
LayerWeight.java 1.3 -> 1.4
diff -u -r1.3 -r1.4
--- LayerWeight.java	17 Jul 2008 21:51:08 -0000	1.3
+++ LayerWeight.java	21 Jul 2008 21:21:12 -0000	1.4
@@ -29,6 +29,13 @@
 public class LayerWeight {
     
         private double default_weight = 1.0;
+        private double adjacence_constant = 1.0;
+
+        private double adjacence_exponent = 1.0;
+
+    
+        private double adjacence_multiplier = 2.0; 
+        
         private Map<DumbLayer, Double> weights; 
         String targetDetector = "None Specified"; 
         public LayerWeight(){
@@ -78,6 +85,30 @@
             return ret; 
         }
         
+        public double getAdjacenceConstant() {
+            return adjacence_constant;
+        }       
+
+        public double getAdjacenceMultiplier() {
+            return adjacence_multiplier;
+        }
+
+        public void setAdjacenceMultiplier(double adjacence_multiplier) {
+            this.adjacence_multiplier = adjacence_multiplier;
+        }
+        
+        public void setAdjacenceConstant(double adjacence_constant) {
+            this.adjacence_constant = adjacence_constant;
+        }
+        
+        public double getAdjacenceExponent() {
+            return adjacence_exponent;
+        }
+
+        public void setAdjacenceExponent(double adjacence_exponent) {
+            this.adjacence_exponent = adjacence_exponent;
+        }
+        
         
         /**
          * Returns the prefix of the default resource path to where the 
@@ -157,6 +188,9 @@
             try {
                 
                 lw.setDefaultWeight(Double.valueOf(root.getChildText("DefaultWeight")).doubleValue());
+                lw.setAdjacenceMultiplier(Double.valueOf(root.getChildText("AdjacenceMultiplier")).doubleValue());
+                lw.setAdjacenceConstant(Double.valueOf(root.getChildText("AdjacenceConstant")).doubleValue());
+                lw.setAdjacenceExponent(Double.valueOf(root.getChildText("AdjacenceExponent")).doubleValue());
                 lw.setTargetDetector(root.getChildText("TargetDetector"));
                 for (Object o : root.getChildren("Layer")){
                     
@@ -187,6 +221,9 @@
             
             root.addContent(new Element("DefaultWeight").addContent(String.valueOf(default_weight))); 
             root.addContent(new Element("TargetDetector").addContent(String.valueOf(targetDetector))); 
+            root.addContent(new Element("AdjacenceConstant").addContent(String.valueOf(adjacence_constant))); 
+            root.addContent(new Element("AdjacenceMultiplier").addContent(String.valueOf(adjacence_multiplier))); 
+            root.addContent(new Element("AdjacenceExponent").addContent(String.valueOf(adjacence_exponent))); 
             for (DumbLayer lyr : weights.keySet()){
                 Element layer = new Element("Layer"); 
                 layer.setAttribute("layer_number", String.valueOf(lyr.layer)); 

lcsim/src/org/lcsim/contrib/seedtracker/strategybuilder
SubsetScorer.java 1.2 -> 1.3
diff -u -r1.2 -r1.3
--- SubsetScorer.java	17 Jul 2008 00:52:39 -0000	1.2
+++ SubsetScorer.java	21 Jul 2008 21:21:12 -0000	1.3
@@ -18,8 +18,9 @@
         
         Map<Set<DumbLayer>,Integer> setmap = new HashMap<Set<DumbLayer>,Integer>(); 
         LayerWeight weighter = new LayerWeight(); 
+        Map<Set<DumbLayer>,Integer> adjacencemap = new HashMap<Set<DumbLayer>,Integer>(); 
         
-        public SubsetScorer(List<Set<DumbLayer>> setlist) {
+        public SubsetScorer(List<Set<DumbLayer>> setlist, List<Set<DumbLayer>> adjacentSets) {
             
             for (Set<DumbLayer> set : setlist) {
                 if(setmap.containsKey(set)){
@@ -28,14 +29,34 @@
                     setmap.put(set,1); 
                 }
             }
+            
+           for (Set<DumbLayer> set : adjacentSets) {
+                if(adjacencemap.containsKey(set)){
+                    adjacencemap.put(set,adjacencemap.get(set).intValue()+1);  
+                } else {
+                    adjacencemap.put(set,1); 
+                }
+            }
+           
+//           System.out.println(adjacencemap.toString());
         }
         
         public void setLayerWeight(LayerWeight lw) {
             weighter = lw; 
         }
         
+       
+        //s * w * (a + b * adjacence ^ c)
+        //
         public double getScore(Set<DumbLayer> testSet) {
-          return getUnweightedScore(testSet)*weighter.getWeight(testSet); 
+          return getUnweightedScore(testSet) * weighter.getWeight(testSet)
+                  * (  weighter.getAdjacenceConstant() + 
+                        Math.pow(getAdjacence(testSet), weighter.getAdjacenceExponent())
+                         * weighter.getAdjacenceMultiplier() 
+                    ); 
+            
+            
+         
         }
         
         public double getUnweightedScore(Set<DumbLayer> testSet){
@@ -49,6 +70,14 @@
             return ret;
         }
         
+        public int getAdjacence(Set<DumbLayer> testSet){
+            if (adjacencemap.containsKey(testSet)){
+                return adjacencemap.get(testSet); 
+            } 
+            
+            return 0; 
+        }
+        
         public void markUsed(Set<DumbLayer> testSet) {
             for (Set<DumbLayer> s : setmap.keySet()){
                 if (s.containsAll(testSet)) {

lcsim/resources/org/lcsim/contrib/seedtracker/strategybuilder/weights
default_weights.xml 1.1 -> 1.2
diff -u -r1.1 -r1.2
--- default_weights.xml	17 Jul 2008 00:52:39 -0000	1.1
+++ default_weights.xml	21 Jul 2008 21:21:12 -0000	1.2
@@ -1,47 +1,87 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <LayerWeight>
-
+   
+     
+<!-- 
+    By Cosmin Deaconu
+    
+    These weights were found to work satisfactorily with single
+    muon events. They should certainly not be considered optimal... 
+    
+    Unfortunately, coming up with good weights seems to be a little bit of
+    black magic... 
+    
+    Score is calculated with the following formula:
+    
+    N*w*(c+m*a^e)
+    
+    N = Number of new tracks that could theoretically be found
+    w = Average weight of subset layers
+    a = Adjacence, the number of times in the training event that the 
+        subset layers are adjacent (i.e., they are hit consecutively by an
+        MCParticle). 
+    c = AdjacenceConstant
+    m = AdjacenceMultiplier
+    e = AdjacenceExponent
+    
+        
+    -->
+    
   <TargetDetector>sid01_planar_tracker</TargetDetector>
   
   <!--Default used for any not already defined-->
   <DefaultWeight>1.0</DefaultWeight>
 
+  <!-- Adjacence modifiers (see above for formula)-->
+  <AdjacenceConstant>2</AdjacenceConstant>
+  <AdjacenceMultiplier>1</AdjacenceMultiplier>
+  <AdjacenceExponent>0.1</AdjacenceExponent>
+
   <!--Barrel-->
 
-    <Layer layer_number="5" detector_name="SiTrackerBarrel" be_flag="BARREL">100.0</Layer>
-    <Layer layer_number="4" detector_name="SiTrackerBarrel" be_flag="BARREL">100.0</Layer>
-    <Layer layer_number="3" detector_name="SiTrackerBarrel" be_flag="BARREL">100.0</Layer>
-    <Layer layer_number="2" detector_name="SiTrackerBarrel" be_flag="BARREL">50</Layer>
-    <Layer layer_number="1" detector_name="SiTrackerBarrel" be_flag="BARREL">20.0</Layer>
+    <Layer layer_number="5" detector_name="SiTrackerBarrel" be_flag="BARREL">2.00</Layer>
+    <Layer layer_number="4" detector_name="SiTrackerBarrel" be_flag="BARREL">1.08</Layer>
+    <Layer layer_number="3" detector_name="SiTrackerBarrel" be_flag="BARREL">1.07</Layer>
+    <Layer layer_number="2" detector_name="SiTrackerBarrel" be_flag="BARREL">1.06</Layer>
+    <Layer layer_number="1" detector_name="SiTrackerBarrel" be_flag="BARREL">1</Layer>
     <Layer layer_number="5" detector_name="SiVertexBarrel" be_flag="BARREL">1</Layer>
-    <Layer layer_number="4" detector_name="SiVertexBarrel" be_flag="BARREL">1</Layer>
-    <Layer layer_number="3" detector_name="SiVertexBarrel" be_flag="BARREL">20.0</Layer>
-    <Layer layer_number="2" detector_name="SiVertexBarrel" be_flag="BARREL">20.0</Layer>
-    <Layer layer_number="1" detector_name="SiVertexBarrel" be_flag="BARREL">20.0</Layer>
+    <Layer layer_number="4" detector_name="SiVertexBarrel" be_flag="BARREL">1.01</Layer>
+    <Layer layer_number="3" detector_name="SiVertexBarrel" be_flag="BARREL">1.02</Layer>
+    <Layer layer_number="2" detector_name="SiVertexBarrel" be_flag="BARREL">1.03</Layer>
+    <Layer layer_number="1" detector_name="SiVertexBarrel" be_flag="BARREL">1.04</Layer>
 
+    
   <!--North Endcap-->
 
-  <Layer layer_number="4" detector_name="SiTrackerEndcap" be_flag="ENDCAP_NORTH">3</Layer>
-  <Layer layer_number="3" detector_name="SiTrackerEndcap" be_flag="ENDCAP_NORTH">3</Layer>
-  <Layer layer_number="2" detector_name="SiTrackerEndcap" be_flag="ENDCAP_NORTH">3</Layer>
-  <Layer layer_number="1" detector_name="SiTrackerEndcap" be_flag="ENDCAP_NORTH">2</Layer>
-
-  <Layer layer_number="3" detector_name="SiTrackerForward" be_flag="ENDCAP_NORTH">1</Layer>
-  <Layer layer_number="2" detector_name="SiTrackerForward" be_flag="ENDCAP_NORTH">1.1</Layer>
-  <Layer layer_number="1" detector_name="SiTrackerForward" be_flag="ENDCAP_NORTH">1.2</Layer>
-
-
-	<!--South Endcap-->
-
-  <Layer layer_number="4" detector_name="SiTrackerEndcap" be_flag="ENDCAP_SOUTH">3</Layer>
-  <Layer layer_number="3" detector_name="SiTrackerEndcap" be_flag="ENDCAP_SOUTH">3</Layer>
-  <Layer layer_number="2" detector_name="SiTrackerEndcap" be_flag="ENDCAP_SOUTH">3</Layer>
-  <Layer layer_number="1" detector_name="SiTrackerEndcap" be_flag="ENDCAP_SOUTH">2</Layer>
-
-  <Layer layer_number="3" detector_name="SiTrackerForward" be_flag="ENDCAP_SOUTH">1</Layer>
-  <Layer layer_number="2" detector_name="SiTrackerForward" be_flag="ENDCAP_SOUTH">1.1</Layer>
-  <Layer layer_number="1" detector_name="SiTrackerForward" be_flag="ENDCAP_SOUTH">1.2</Layer>
+    <Layer layer_number="4" detector_name="SiTrackerEndcap" be_flag="ENDCAP_NORTH">1.09</Layer>
+    <Layer layer_number="3" detector_name="SiTrackerEndcap" be_flag="ENDCAP_NORTH">1.08</Layer>
+    <Layer layer_number="2" detector_name="SiTrackerEndcap" be_flag="ENDCAP_NORTH">1.07</Layer>
+    <Layer layer_number="1" detector_name="SiTrackerEndcap" be_flag="ENDCAP_NORTH">1.06</Layer>
+
+    <Layer layer_number="3" detector_name="SiTrackerForward" be_flag="ENDCAP_NORTH">1.0</Layer>
+    <Layer layer_number="2" detector_name="SiTrackerForward" be_flag="ENDCAP_NORTH">1.01</Layer>
+    <Layer layer_number="1" detector_name="SiTrackerForward" be_flag="ENDCAP_NORTH">1.02</Layer>
+
+    <Layer layer_number="4" detector_name="SiVertexEndcap" be_flag="ENDCAP_NORTH">0.5</Layer>
+    <Layer layer_number="3" detector_name="SiVertexEndcap" be_flag="ENDCAP_NORTH">0.5</Layer>
+    <Layer layer_number="2" detector_name="SiVertexEndcap" be_flag="ENDCAP_NORTH">0.5</Layer>
+    <Layer layer_number="1" detector_name="SiVertexEndcap" be_flag="ENDCAP_NORTH">0.5</Layer>
+  
+  <!--South Endcap-->
 
+    <Layer layer_number="4" detector_name="SiTrackerEndcap" be_flag="ENDCAP_SOUTH">1.09</Layer>
+    <Layer layer_number="3" detector_name="SiTrackerEndcap" be_flag="ENDCAP_SOUTH">1.08</Layer>
+    <Layer layer_number="2" detector_name="SiTrackerEndcap" be_flag="ENDCAP_SOUTH">1.07</Layer>
+    <Layer layer_number="1" detector_name="SiTrackerEndcap" be_flag="ENDCAP_SOUTH">1.06</Layer>
+
+    <Layer layer_number="3" detector_name="SiTrackerForward" be_flag="ENDCAP_SOUTH">1.0</Layer>
+    <Layer layer_number="2" detector_name="SiTrackerForward" be_flag="ENDCAP_SOUTH">1.01</Layer>
+    <Layer layer_number="1" detector_name="SiTrackerForward" be_flag="ENDCAP_SOUTH">1.02</Layer>
+
+    <Layer layer_number="4" detector_name="SiVertexEndcap" be_flag="ENDCAP_SOUTH">0.5</Layer>
+    <Layer layer_number="3" detector_name="SiVertexEndcap" be_flag="ENDCAP_SOUTH">0.5</Layer>
+    <Layer layer_number="2" detector_name="SiVertexEndcap" be_flag="ENDCAP_SOUTH">0.5</Layer>
+    <Layer layer_number="1" detector_name="SiVertexEndcap" be_flag="ENDCAP_SOUTH">0.5</Layer>
 
 </LayerWeight>
 

lcsim/src/org/lcsim/contrib/seedtracker/digiexample
DigiSeedTrackerDriver.java 1.5 -> 1.6
diff -u -r1.5 -r1.6
--- DigiSeedTrackerDriver.java	17 Jul 2008 21:11:36 -0000	1.5
+++ DigiSeedTrackerDriver.java	21 Jul 2008 21:21:12 -0000	1.6
@@ -22,10 +22,10 @@
     
     public DigiSeedTrackerDriver() {
         add(new DigiHitMaker()); //this actually makes the hits 
-//        SeedTracker st = new SeedTracker(new BetterPlanarStrategy().getStrategies());
-        
- 
+//        SeedTracker st = new SeedTracker(new BetterPlanarStrategy().getStrategies());i
+
         SeedTracker st = new SeedTracker(StrategyXMLUtils.getStrategyListFromResource(StrategyXMLUtils.getDefaultStrategiesPrefix() + strategy_file)); 
+
 //        st.setDiagnostics(new SeedTrackerDiagnostics());
         add(st);
 //        add(new AnalysisDriver());
CVSspam 0.2.8