lcsim/src/org/lcsim/mc/fast/tracking

diff -u -r1.1 -r1.2
--- MCFastTrackFactory.java	20 Jun 2006 10:20:12 -0000	1.1
+++ MCFastTrackFactory.java	20 Jun 2006 22:43:07 -0000	1.2
@@ -18,29 +18,43 @@

  */
 public class MCFastTrackFactory {
 

-    private boolean beamConstraint = false;
-    private double bField = 5.;
-    private TrackResolutionTables tables;
-    private SimpleTables simpleTables; 
-    private Random rand = new Random();
-    private boolean makeHists = false;
-    private boolean useSimpleTables = false;

+    private boolean _beamConstraint;
+    private double _bField = 5.;
+    private TrackResolutionTables _tables;
+    private SimpleTables _simpleTables; 
+    private Random _random = new Random();
+    private boolean _makeHists = false;
+    private boolean _useSimpleTables = false;

     public MCFastTrackFactory() {

+	this("sidaug05", 5., new Random(), false, false, false);
+    }
+    public MCFastTrackFactory(String detector
+			    , double bField
+			    , Random random
+			    , boolean beamConstraint
+			    , boolean makeHists
+			    , boolean useSimpleTables) {
+	_bField = bField;
+	_random = random;
+	_beamConstraint = beamConstraint;
+	_makeHists = makeHists;
+	_useSimpleTables = useSimpleTables;
+

         ConditionsManager manager = ConditionsManager.defaultInstance();
         try {

-            manager.setDetector("sidaug05", 0);

+            manager.setDetector(detector, 0);

         } catch (ConditionsManager.ConditionsNotFoundException e) {
         }
         ConditionsSet trackParameters = manager.getConditions("TrackParameters");
         ConditionsSet simpleTrack = manager.getConditions("SimpleTrack");
         try {

-            tables = new TrackResolutionTables(trackParameters, beamConstraint);
-            simpleTables = new SimpleTables(simpleTrack);

+            _tables = new TrackResolutionTables(trackParameters, beamConstraint);
+            _simpleTables = new SimpleTables(simpleTrack);

         } catch(IOException e) {
         }
     }
 

-    Track getMCTrack(SpacePoint momentum, SpacePoint location, int charge) {
-        return new FastMCTrack(momentum, location, charge, bField, tables, simpleTables, rand, makeHists, useSimpleTables);

+    public Track getMCTrack(SpacePoint momentum, SpacePoint location, int charge) {
+        return new FastMCTrack(momentum, location, charge, _bField, _tables, _simpleTables, _random, _makeHists, _useSimpleTables);

     }
 }

lcsim/src/org/lcsim/mc/fast/tracking

diff -u -r1.3 -r1.4
--- ResolutionTable.java	20 Jun 2006 10:20:12 -0000	1.3
+++ ResolutionTable.java	20 Jun 2006 22:43:07 -0000	1.4
@@ -25,8 +25,9 @@

    }
 
    LookupTable findTable(int i, int j) {

-	   String name = new String();
-	   return findTable(String.format("(%s,%s):", i, j));

+	   String name = String.format("(%s,%s):", i+1, j+1);
+	   // System.out.printf("%s\n", name);
+	   return findTable(name);

    }