hps-java/src/test/java/org/lcsim/hps/recon/tracking

diff -u -r1.7 -r1.8
--- TestRunTrackReconTest.java	25 Oct 2013 20:29:03 -0000	1.7
+++ TestRunTrackReconTest.java	25 Oct 2013 21:03:20 -0000	1.8
@@ -1,12 +1,9 @@

-/*
- * To change this template, choose Tools | Templates
- * and open the template in the editor.
- */

 package org.lcsim.hps.recon.tracking;
 
 import hep.aida.IAnalysisFactory;
 import hep.aida.IHistogram1D;
 import hep.aida.ITree;

+

 import java.io.File;
 import java.io.IOException;
 import java.net.MalformedURLException;

@@ -15,12 +12,15 @@

 import java.util.List;
 import java.util.logging.Level;
 import java.util.logging.Logger;

-import static junit.framework.Assert.assertTrue;

+

 import junit.framework.TestCase;

+

 import org.lcsim.event.EventHeader;
 import org.lcsim.event.Track;
 import org.lcsim.event.TrackerHit;

+import org.lcsim.hps.conditions.CalibrationDriver;

 import org.lcsim.hps.util.CompareHistograms;

+import org.lcsim.recon.tracking.digitization.sisim.config.RawTrackerHitSensorSetup;

 import org.lcsim.util.Driver;
 import org.lcsim.util.aida.AIDA;
 import org.lcsim.util.cache.FileCache;

@@ -54,7 +54,7 @@

         //Process and write out the file
         LCSimLoop loop = new LCSimLoop();
         loop.setLCIORecordSource(lcioInputFile);

-        loop.add(new MainTrackingDriverTest());

+        loop.add(new MainTrackingDriver());

         File outputFile = new TestOutputFile(testFileName.replaceAll(".slcio", "") + "_hpsTestRunTrackingTest.slcio");
         outputFile.getParentFile().mkdirs(); //make sure the parent directory exists
         loop.add(new LCIODriver(outputFile));

@@ -197,4 +197,28 @@

 
         }
     }

+    
+    public class MainTrackingDriver extends Driver {
+        
+        public MainTrackingDriver() {
+
+            //Setup the sensors and calibrations
+            CalibrationDriver calibDriver = new CalibrationDriver();
+            //calibDriver.setRunNumber(1351); //not sure what should be done here!? -> FIX THIS!
+            add(calibDriver);
+            add(new RawTrackerHitSensorSetup());
+            HPSRawTrackerHitFitterDriver hitfitter = new HPSRawTrackerHitFitterDriver();
+            hitfitter.setFitAlgorithm("Analytic");
+            hitfitter.setCorrectT0Shift(true);
+            add(hitfitter);
+            add(new DataTrackerHitDriver());
+            HelicalTrackHitDriver hth_driver = new HelicalTrackHitDriver();
+            hth_driver.setMaxSeperation(20.0);
+            hth_driver.setTolerance(1.0);
+            add(hth_driver);
+            TrackerReconDriver track_recon_driver = new TrackerReconDriver();
+            add(track_recon_driver);
+        }
+
+    }

 }

hps-java/src/test/java/org/lcsim/hps/recon/tracking

diff -N MainTrackingDriverTest.java
--- MainTrackingDriverTest.java	25 Oct 2013 20:29:03 -0000	1.1
+++ /dev/null	1 Jan 1970 00:00:00 -0000
@@ -1,36 +0,0 @@

-package org.lcsim.hps.recon.tracking;
-
-import org.lcsim.hps.conditions.CalibrationDriver;
-import org.lcsim.recon.tracking.digitization.sisim.config.RawTrackerHitSensorSetup;
-import org.lcsim.util.Driver;
-
-/**
- *
- * Sets up the standard track reco drivers
- * 
- * @author phansson
- */
-
-public class MainTrackingDriverTest extends Driver {
-        
-    public MainTrackingDriverTest() {
-
-        //Setup the sensors and calibrations
-        CalibrationDriver calibDriver = new CalibrationDriver();
-        //calibDriver.setRunNumber(1351); //not sure what should be done here!? -> FIX THIS!
-        add(calibDriver);
-        add(new RawTrackerHitSensorSetup());
-        HPSRawTrackerHitFitterDriver hitfitter = new HPSRawTrackerHitFitterDriver();
-        hitfitter.setFitAlgorithm("Analytic");
-        hitfitter.setCorrectT0Shift(true);
-        add(hitfitter);
-        add(new DataTrackerHitDriver());
-        HelicalTrackHitDriver hth_driver = new HelicalTrackHitDriver();
-        hth_driver.setMaxSeperation(20.0);
-        hth_driver.setTolerance(1.0);
-        add(hth_driver);
-        TrackerReconDriver track_recon_driver = new TrackerReconDriver();
-        add(track_recon_driver);
-    }
-
-}