lcsim/src/org/lcsim/contrib/seedtracker/strategybuilder

RunStrategyBuilder.java 1.3 -> 1.4

diff -u -r1.3 -r1.4
--- RunStrategyBuilder.java	17 Jul 2008 17:55:27 -0000	1.3
+++ RunStrategyBuilder.java	17 Jul 2008 19:52:01 -0000	1.4
@@ -7,6 +7,7 @@

 
 import java.io.File;
 import org.lcsim.contrib.seedtracker.StrategyXMLUtils;

+import org.lcsim.util.Driver;

 import org.lcsim.util.loop.LCSimLoop;
 
 /**

@@ -36,6 +37,7 @@

         String lwfn = ""; 
         int mintrks = 3;
         String filterClassName = "";

+        String altDriver = "";

         //parse arguments.. if error print usage
         try{
             int no_flag_counter = 0;

@@ -65,6 +67,8 @@

                     mintrks = Integer.valueOf(args[++i]);
                 } else if (arg.equals("-f")) {
                     filterClassName = args[++i];

+                } else if (arg.equals("-a")) {
+                    altDriver =args[++i];

                 } else if (arg.startsWith("-")){
                     throw new Exception(); 
                 } else {

@@ -79,7 +83,30 @@

             printUsage();
             System.exit(1); 
         }

-        StrategyBuilder builder = new StrategyBuilder(); // prevent compiler from complaining that driver might not have been initialized.

+        IStrategyBuilder builder = new StrategyBuilder(); 
+        
+        if (altDriver.length() > 0) {
+            try {
+                builder = (IStrategyBuilder) Class.forName(altDriver).newInstance();
+            }  catch (ClassNotFoundException cfne) {
+                System.out.println("Class "+altDriver+ " not found :'( Exiting."); 
+                System.exit(3); 
+            } catch (InstantiationException ie){
+                System.out.println("Class "+altDriver+ " could not be instantiated. Does the constructor take arguments? Exiting.");
+                System.exit(4); 
+            } catch (IllegalAccessException iae){
+                System.out.println("IllegalAccessException? WTF does that mean? Exiting."); 
+                System.exit(5); 
+            } catch (ClassCastException cce){
+                System.out.println("Unable to cast "+altDriver+ " as a IStrategyBuilder. Exiting"); 
+                System.exit(6); 
+            }
+            
+            if (!(builder instanceof Driver)) {
+                System.out.println("Alternative driver must extend Driver. Exiting"); 
+                System.exit(14123); 
+            }
+        }

         
         builder.setVerbose(verbose);
         builder.setDivideByTwoFlag(flag);

@@ -102,23 +129,23 @@

                 builder.setParticleFilter((IParticleFilter) Class.forName(filterClassName).newInstance());
             } catch (ClassNotFoundException cfne) {
                 System.out.println("Class "+filterClassName+ " not found :'( Exiting.");

-                System.exit(3);

+                System.exit(123);

             } catch (InstantiationException ie){
                 System.out.println("Class "+filterClassName+ " could not be instantiated. Does the constructor take arguments? Exiting.");

-                System.exit(4);

+                System.exit(234);

             } catch (IllegalAccessException iae){
                 System.out.println("IllegalAccessException? WTF does that mean? Exiting.");

-                System.exit(5);

+                System.exit(345);

             } catch (ClassCastException cce){
                 System.out.println("Unable to cast "+filterClassName+ " as a IParticleFilter. Exiting");

-                System.exit(6);

+                System.exit(456);

             }
         }
         
         File file = new File(filename);
         if (!file.exists()) {
             System.out.println("Cannot find data file "+file.toString()+". Exiting. ");

-            System.exit(7);

+            System.exit(7);

@@ -130,7 +157,7 @@

 
             LCSimLoop loop = new LCSimLoop(); 
             loop.setLCIORecordSource(file);

-            loop.add( builder  );

+            loop.add( (Driver) builder );

             loop.loop(numEvents, null); 
             loop.dispose(); 
         } catch (Exception e){

@@ -156,6 +183,9 @@

         System.out.println(" -f FILTER_CLASS\t\tSpecify an MCParticle filter by naming a " +
                 "\n\t\t\t\t fully qualified (i.e. org.lcsim.etc) class. \n\t\t\t\t By default, " +
                 "a filter based on the prototype \n\t\t\t\t strategy cutoffs is used.");

+        System.out.println(" -a ALTERNATIVE_DRIVER\t\tUse an alternative driver instead of \n\t\t\t\t the default StrategyBuilder. " +
+                "Must implement\n\t\t\t\t IStrategyBuilder and extend Driver. UNTESTED.\n\t\t\t\t " +
+                "Fully qualified class name must be used \n\t\t\t\t (i.e. org.lcsim.etc)");

     }
     
 }

+ @Override + protected void startOfData(){ + //Use default filter if none is specified + if (filter==null){ + filter = new StrategyBasedFilter(prototype); + } + }

- - //if no filter defined, use StrategyBasedFilter - if (filter==null){ - filter = new StrategyBasedFilter(prototype); - double b = detector.getFieldMap().getField(ip).z(); - ((StrategyBasedFilter) filter).setBField(b); - } -

Commit in `lcsim/src/org/lcsim/contrib/seedtracker` on MAIN
`strategybuilder/IParticleFilter.java`	+12	-1	1.1 -> 1.2
`/StrategyBasedFilter.java`	+11	-4	1.2 -> 1.3
`/RunStrategyBuilder.java`	+37	-7	1.3 -> 1.4
`/StrategyBuilder.java`	+13	-13	1.3 -> 1.4
`/AllPassFilter.java`	+4		1.1 -> 1.2
`digiexample/DigiSeedTrackerDriver.java`	+1	-1	1.3 -> 1.4
	+78	-26