diff -u -r1.36 -r1.37
--- HelicalTrackHitDriver.java	24 Aug 2009 22:19:20 -0000	1.36
+++ HelicalTrackHitDriver.java	25 Aug 2009 00:01:59 -0000	1.37
@@ -13,21 +13,13 @@

 import hep.physics.vec.VecOp;
 
 import java.util.ArrayList;

+import java.util.Arrays;

 import java.util.HashMap;
 import java.util.HashSet;
 import java.util.List;
 import java.util.Map;

-

 import java.util.Set;

-import org.lcsim.recon.tracking.digitization.sisim.SiTrackerHit;
-import org.lcsim.recon.tracking.digitization.sisim.SiTrackerHitStrip1D;
-import org.lcsim.recon.tracking.digitization.sisim.TrackerHitType.CoordinateSystem;
-import org.lcsim.recon.tracking.vsegment.geom.SegmentationManager;
-import org.lcsim.recon.tracking.vsegment.geom.Sensor;
-import org.lcsim.recon.tracking.vsegment.geom.SensorType;
-import org.lcsim.recon.tracking.vsegment.geom.sensortypes.Cylinder;
-import org.lcsim.recon.tracking.vsegment.hit.DigiTrackerHit;
-import org.lcsim.recon.tracking.vsegment.hit.TrackerCluster;

+

 import org.lcsim.detector.IDetectorElement;
 import org.lcsim.detector.ITransform3D;
 import org.lcsim.detector.tracker.silicon.SiSensor;

@@ -41,6 +33,15 @@

 import org.lcsim.event.TrackerHit;
 import org.lcsim.event.base.BaseTrackerHitMC;
 import org.lcsim.geometry.subdetector.BarrelEndcapFlag;

+import org.lcsim.recon.tracking.digitization.sisim.SiTrackerHit;
+import org.lcsim.recon.tracking.digitization.sisim.SiTrackerHitStrip1D;
+import org.lcsim.recon.tracking.digitization.sisim.TrackerHitType.CoordinateSystem;
+import org.lcsim.recon.tracking.vsegment.geom.SegmentationManager;
+import org.lcsim.recon.tracking.vsegment.geom.Sensor;
+import org.lcsim.recon.tracking.vsegment.geom.SensorType;
+import org.lcsim.recon.tracking.vsegment.geom.sensortypes.Cylinder;
+import org.lcsim.recon.tracking.vsegment.hit.DigiTrackerHit;
+import org.lcsim.recon.tracking.vsegment.hit.TrackerCluster;

 import org.lcsim.spacegeom.SpacePointVector;
 import org.lcsim.util.Driver;
 

@@ -335,21 +336,33 @@

     public void setDigiCollectionName(String name)
     {
     	_digcol.add(name);

-    	return;

+    }
+    
+    public void setDigiCollectionNames(String names[])
+    {
+    	_digcol.addAll(Arrays.asList(names));

     }
     
     public void setVirtualSegmentationCollectionName(String name)
     {
     	_vscol.add(name);

-    	return;

+    }
+    
+    public void setVirtualSegmentationCollectionNames(String names[])
+    {
+    	_vscol.addAll(Arrays.asList(names));

     }
     
     public void setBaseCollectionName(String name)
     {
     	_bscol.add(name);

-    	return;

     }
     

+    public void setBaseCollectionNames(String names[])
+    {
+    	_bscol.addAll(Arrays.asList(names));
+    }
+            

     /**
      * Name of the HelicalTrackHit collection to be put back in the event.
      * @param outname Name to use for the HelicalTrackHit collection

diff -u -r1.1 -r1.2
--- SiVertexEndcapSensorSetup.java	21 Aug 2009 20:51:03 -0000	1.1
+++ SiVertexEndcapSensorSetup.java	25 Aug 2009 00:01:59 -0000	1.2
@@ -22,8 +22,9 @@

 import org.lcsim.geometry.compact.Subdetector;
 import org.lcsim.geometry.subdetector.SiTrackerEndcap;
 import org.lcsim.geometry.subdetector.SiTrackerEndcap2;

+import org.lcsim.util.Driver;

-public class SiVertexEndcapSensorSetup

+public class SiVertexEndcapSensorSetup extends Driver

 {
 	
 	String subdetectorName;

diff -u -r1.1 -r1.2
--- SimTrackerHitReadoutDriver.java	24 Aug 2009 23:07:39 -0000	1.1
+++ SimTrackerHitReadoutDriver.java	25 Aug 2009 00:01:59 -0000	1.2
@@ -11,8 +11,7 @@

  * corresponding {@link org.lcsim.detector.IDetectorElement}.
  * @author jeremym
  */

-public class SimTrackerHitReadoutDriver 
-extends CollectionHandler

+public class SimTrackerHitReadoutDriver extends CollectionHandler

 {	
 	boolean needCleanupDriver=true;
 	boolean debug=false;

diff -u -r1.1 -r1.2
--- StripDigiSetupDriver.java	24 Aug 2009 23:07:39 -0000	1.1
+++ StripDigiSetupDriver.java	25 Aug 2009 00:01:59 -0000	1.2
@@ -80,13 +80,13 @@

 	{
 		if (!subdetectorNames.contains(name))
 			subdetectorNames.add(name);

-	}	
-	
-	public void setSubdetectorNames(String names[])
-	{
-		subdetectorNames.addAll(Arrays.asList(names));

 	}

-		

+	
+	public void setSubdetectorNames(String[] collectionNames)
+    {
+    	subdetectorNames.addAll(Arrays.asList(collectionNames));
+    }
+			

 	public void setNoiseIntercept(double noiseIntercept)
 	{
 		this.noiseIntercept = noiseIntercept;

diff -u -r1.2 -r1.3
--- digiTest.xml	24 Aug 2009 23:31:42 -0000	1.2
+++ digiTest.xml	25 Aug 2009 00:01:59 -0000	1.3
@@ -8,27 +8,41 @@

     </control>
     <execute>
         <driver name="VertexBarrelSetup"/>

+        <driver name="VertexEndcapSetup"/>

         <driver name="TrackerBarrelSetup"/>

+        <driver name="TrackerEndcapSetup"/>

         <driver name="ReadoutDriver"/>

-        <driver name="TrackerBarrelDigi"/>
-        <driver name="VertexBarrelDigi"/>

+        <driver name="TrackerDigi"/>
+        <driver name="VertexDigi"/>

         <driver name="TestTracking" />
         <driver name="Writer"/>
     </execute>
     <drivers>
         <driver name="ReadoutDriver"
                 type="org.lcsim.recon.tracking.digitization.sisim.config.SimTrackerHitReadoutDriver">

-            <readoutCollections>SiVertexBarrel_RO SiTrackerBarrel_RO</readoutCollections>

+            <readoutCollections>SiVertexBarrel_RO SiVertexEndcap_RO SiTrackerBarrel_RO SiTrackerEndcap_RO</readoutCollections>

         </driver>
         <driver name="TrackerBarrelSetup"
                 type="org.lcsim.recon.tracking.digitization.sisim.config.SiTrackerBarrelSensorSetup">
             <subdetectorName>SiTrackerBarrel</subdetectorName>
         </driver>

-        <driver name="TrackerBarrelDigi"

+        <driver name="TrackerEndcapSetup"
+                type="org.lcsim.recon.tracking.digitization.sisim.config.SiTrackerEndcapSensorSetup">
+            <subdetectorName>SiTrackerEndcap</subdetectorName>
+        </driver>
+        <driver name="VertexBarrelSetup"
+                type="org.lcsim.recon.tracking.digitization.sisim.config.SiVertexBarrelSensorSetup">
+            <subdetectorName>SiVertexBarrel</subdetectorName>
+        </driver>
+        <driver name="VertexEndcapSetup"
+                type="org.lcsim.recon.tracking.digitization.sisim.config.SiVertexEndcapSensorSetup">
+            <subdetectorName>SiVertexEndcap</subdetectorName>
+        </driver>
+        <driver name="TrackerDigi"

                 type="org.lcsim.recon.tracking.digitization.sisim.config.StripDigiSetupDriver">

-            <subdetectorName>SiTrackerBarrel</subdetectorName>
-            <rawHitsCollectionName>SiTrackerBarrel_RawTrackerHits</rawHitsCollectionName>
-            <trackerHitsCollectionName>SiTrackerBarrel_TrackerHits</trackerHitsCollectionName> 

+            <subdetectorNames>SiTrackerBarrel SiTrackerEndcap</subdetectorNames>
+            <rawHitsCollectionName>TKR_RawTrackerHits</rawHitsCollectionName>
+            <trackerHitsCollectionName>TKR_TrackerHits</trackerHitsCollectionName> 

             <maxClusterSize>10</maxClusterSize>
             <noiseIntercept>300.</noiseIntercept>
             <noiseSlope>30.</noiseSlope>

@@ -41,17 +55,13 @@

             <twoClusterErr>0.2</twoClusterErr>
             <threeClusterErr>0.333333333</threeClusterErr>
             <fourClusterErr>0.5</fourClusterErr>

-            <fiveClusterErr>1.0</fiveClusterErr>

+

         </driver>

-        <driver name="VertexBarrelSetup"
-                type="org.lcsim.recon.tracking.digitization.sisim.config.SiVertexBarrelSensorSetup">
-            <subdetectorName>SiVertexBarrel</subdetectorName>
-        </driver>
-        <driver name="VertexBarrelDigi" 

+        <driver name="VertexDigi" 

                 type="org.lcsim.recon.tracking.digitization.sisim.config.PixelDigiSetupDriver">

-            <subdetectorName>SiVertexBarrel</subdetectorName>
-            <rawHitsCollectionName>SiVertexBarrel_RawTrackerHits</rawHitsCollectionName>
-            <trackerHitsCollectionName>SiVertexBarrel_TrackerHits</trackerHitsCollectionName>

+            <subdetectorNames>SiVertexBarrel SiVertexEndcap</subdetectorNames> 
+            <rawHitsCollectionName>VXD_RawTrackerHits</rawHitsCollectionName>
+            <trackerHitsCollectionName>VXD_TrackerHits</trackerHitsCollectionName>

             <maxClusterSize>10</maxClusterSize>
             <noiseIntercept>20.</noiseIntercept>
             <noiseSlope>2.</noiseSlope>

@@ -65,16 +75,15 @@

             <fourClusterErr>0.5</fourClusterErr>
             <fiveClusterErr>1.0</fiveClusterErr>
         </driver>

-        <driver name="Writer"
-                type="org.lcsim.util.loop.LCIODriver">
-            <outputFilePath>./target/test-output/digiTest.slcio</outputFilePath>
-            <writeOnlyCollections>SiTrackerBarrel_RO SiTrackerBarrel_RawTrackerHits SiTrackerBarrel_TrackerHits SiVertexBarrel_RO SiVertexBarrel_RawTrackerHits SiVertexBarrel_TrackerHits HelicalTrackHits</writeOnlyCollections>
-        </driver>

         <driver name="TestTracking"
                 type="org.lcsim.fit.helicaltrack.HelicalTrackHitDriver">

-            <digiCollectionName>SiVertexBarrel_TrackerHits</digiCollectionName>
-            <digiCollectionName>SiTrackerBarrel_TrackerHits</digiCollectionName>

+            <digiCollectionNames>VXD_TrackerHits TKR_TrackerHits</digiCollectionNames>

             <outputCollectionName>HelicalTrackHits</outputCollectionName>
         </driver>

+        <driver name="Writer"
+                type="org.lcsim.util.loop.LCIODriver">
+            <outputFilePath>./target/test-output/digiTest.slcio</outputFilePath>
+            <writeOnlyCollections>SiTrackerBarrel_RO SiTrackerEndcap_RO TKR_RawTrackerHits TKR_TrackerHits SiVertexBarrel_RO SiVertexEndcap_RO VXD_RawTrackerHits VXD_TrackerHits HelicalTrackHits</writeOnlyCollections>
+        </driver>

     </drivers>
 </lcsim>