lcsim-contrib/src/main/java/org/lcsim/contrib/onoprien/crux/cat

diff -u -r1.1 -r1.2
--- CatDriver.java	8 Jul 2009 15:59:19 -0000	1.1
+++ CatDriver.java	10 Jul 2009 19:25:02 -0000	1.2
@@ -34,7 +34,7 @@

 import org.lcsim.contrib.onoprien.performance.CheatRecoParticleDriver;
 import org.lcsim.contrib.onoprien.performance.CheatTrackFinderDriver;
 import org.lcsim.contrib.onoprien.performance.Definition;

-import org.lcsim.contrib.onoprien.performance.TrackingAnalysisDriver;

+import org.lcsim.contrib.onoprien.performance.AnalysisDriver;

 import org.lcsim.contrib.onoprien.thp.lib.TrackerDriverSmear;
 import org.lcsim.contrib.onoprien.tooldrivers.CalorimeterDriver;
 import org.lcsim.contrib.onoprien.tooldrivers.TrackerHitRemover;

@@ -48,7 +48,7 @@

  * An example top level driver for Calorimeter Assisted Tracking (stub, unfinished).
  *
  * @author D. Onoprienko

- * @version $Id: CatDriver.java,v 1.1 2009/07/08 15:59:19 onoprien Exp $

+ * @version $Id: CatDriver.java,v 1.2 2009/07/10 19:25:02 onoprien Exp $

  */
 public class CatDriver extends Driver {
 

@@ -199,8 +199,8 @@

     cheatDefCat.setFindable(RecType.TRACK, "FINDABLE", RecType.TRACK_SEED);
     cheatDefCat.setFindable(RecType.TRACK, "FOUND", RecType.TRACK_SEED);
 

-    cheatDefCat.setCollections(RecType.TRACK, _standardTracksName);
-    cheatDefCat.setCollections(RecType.TRACK_SEED, _catSeedsName);

+    cheatDefCat.setCollectionName(RecType.TRACK, _standardTracksName);
+    cheatDefCat.setCollectionName(RecType.TRACK_SEED, _catSeedsName);

 
     // Cheater seed finder (uncomment if using cheater)
 

@@ -263,7 +263,7 @@

 // -- KShort finder :  ---------------------------------------------------------
 
     Definition cheatDefKShort = new Definition();

-    cheatDefKShort.setCollections(RecType.TRACK, _standardTracksName, _catTracksName);

+    cheatDefKShort.setCollectionName(RecType.TRACK, _standardTracksName, _catTracksName);

     cheatDefKShort.setFindable(RecType.PARTICLE, "Type", Particles.K_SHORT);
     cheatDefKShort.setFindable(RecType.PARTICLE, "DAUGHTERS_FOUND", RecType.TRACK);
 

@@ -283,7 +283,7 @@

     defStdTrack.setFindable(RecType.TRACK, "PT", 200*Units.MeV);
     defStdTrack.setFindable(RecType.TRACK, "MIN_TRACK_HIT_LAYERS", 3);
 

-    defStdTrack.setCollections(RecType.TRACK, _standardTracksName);

+    defStdTrack.setCollectionName(RecType.TRACK, _standardTracksName);

 
     // "Standard" track finder performance for KS0 decay products
 

@@ -296,7 +296,7 @@

     defStdTrackKs.setFindable(RecType.TRACK, "TYPE", Particles.PI_MINUS, Particles.PI_PLUS);
     defStdTrackKs.setFindable(RecType.TRACK, "PARENT_TYPE", Particles.K_SHORT);
 

-    defStdTrackKs.setCollections(RecType.TRACK, _standardTracksName);

+    defStdTrackKs.setCollectionName(RecType.TRACK, _standardTracksName);

 
     // CAT track finder "incremental" performance
 

@@ -330,9 +330,9 @@

     defCatInc.setFindable(RecType.PARTICLE, "DAUGHTERS_FINDABLE", RecType.TRACK);
     defCatInc.setFindable(RecType.PARTICLE, "DAUGHTERS_FOUND", RecType.TRACK);
 

-    defCatInc.setCollections(RecType.TRACK_SEED, _catSeedsName);
-    defCatInc.setCollections(RecType.TRACK, _catTracksName);
-    defCatInc.setCollections(RecType.PARTICLE, _ksName);

+    defCatInc.setCollectionName(RecType.TRACK_SEED, _catSeedsName);
+    defCatInc.setCollectionName(RecType.TRACK, _catTracksName);
+    defCatInc.setCollectionName(RecType.PARTICLE, _ksName);

 
     // Combined tracking performance analysis
 

@@ -343,7 +343,7 @@

     defFinal.setFindable(RecType.TRACK, "PT", 200.*Units.MeV);
     defFinal.setFindable(RecType.TRACK, "MIN_TRACK_HIT_LAYERS", 3);
 

-    defFinal.setCollections(RecType.TRACK, _standardTracksName, _catTracksName);

+    defFinal.setCollectionName(RecType.TRACK, _standardTracksName, _catTracksName);

 
     // Combined tracking performance analysis for K shorts
 

@@ -359,12 +359,12 @@

     defFinalKs.setFindable(RecType.PARTICLE, "TYPE", Particles.K_SHORT);
     defFinalKs.setFindable(RecType.PARTICLE, "TRACKABLE", true);
 

-    defFinalKs.setCollections(RecType.TRACK, _standardTracksName, _catTracksName);
-    defFinalKs.setCollections(RecType.PARTICLE, _ksName);

+    defFinalKs.setCollectionName(RecType.TRACK, _standardTracksName, _catTracksName);
+    defFinalKs.setCollectionName(RecType.PARTICLE, _ksName);

 
 //    // Performance analysis driver
 

-    TrackingAnalysisDriver analysisDriver = new TrackingAnalysisDriver();

+    AnalysisDriver analysisDriver = new AnalysisDriver();

     //analysisDriver.set("LOG_LEVEL", Level.FINEST);
     analysisDriver.set("HIST_PT_RANGE", 0., 25.*Units.GeV);
     analysisDriver.set("DEFINITION", defStdTrack, defStdTrackKs, defCatInc, defFinal, defFinalKs);

@@ -379,20 +379,17 @@

 
   /**
    * Main function for running this driver standalone.

-   *
-   * @param args
-   * @throws IOException
-   * @throws LoopException

    */
   public static void main(String[] args) throws IOException, LoopException {

-    System.out.println("Running CatDriver standalone");

     LCSimLoop loop = new LCSimLoop();
     loop.setLCIORecordSource(new File("D:/Physics/Linear Collider/Data/sid02/SingleParticle/K0S_pipi_Theta45-135_5-25Gev_SLIC-v2r5p3_geant4-v9r1p2_LCPhys_sid02.slcio"));
     // Or to read a stdhep file
     //loop.setStdhepRecordSource(new File("myFile.stdhep"),"sid01");
     // Or to read a list of files
     //loop.setLCIORecordSource(new LCIOEventSource(new FileList(new File("myFileList.filelist"),"My File List")));

-    loop.add(new CatDriver());

+    Driver driver = new CatDriver();
+    loop.add(driver);
+    System.out.println("Running "+ driver.getName() +" standalone");

     loop.loop(-1); // 0 means loop forever
     loop.dispose();