Commit in hps-java/src/test/java/org/lcsim/hps/recon/tracking on MAIN | |||
MainTrackingDriverTest.java | +36 | added 1.1 | |
TestRunTrackReconTest.java | +1 | -1 | 1.6 -> 1.7 |
HelicalTrackHitDriverTest.java | +2 | -2 | 1.2 -> 1.3 |
MainTrackingDriver.java | -40 | 1.5 removed | |
+39 | -43 |
fix up test imports; rename test to avoid possible naming conflicts
diff -N MainTrackingDriverTest.java --- /dev/null 1 Jan 1970 00:00:00 -0000 +++ MainTrackingDriverTest.java 25 Oct 2013 20:29:03 -0000 1.1 @@ -0,0 +1,36 @@
+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); + } + +}
diff -u -r1.6 -r1.7 --- TestRunTrackReconTest.java 3 Aug 2013 00:57:03 -0000 1.6 +++ TestRunTrackReconTest.java 25 Oct 2013 20:29:03 -0000 1.7 @@ -54,7 +54,7 @@
//Process and write out the file LCSimLoop loop = new LCSimLoop(); loop.setLCIORecordSource(lcioInputFile);
- loop.add(new MainTrackingDriver());
+ loop.add(new MainTrackingDriverTest());
File outputFile = new TestOutputFile(testFileName.replaceAll(".slcio", "") + "_hpsTestRunTrackingTest.slcio"); outputFile.getParentFile().mkdirs(); //make sure the parent directory exists loop.add(new LCIODriver(outputFile));
diff -u -r1.2 -r1.3 --- HelicalTrackHitDriverTest.java 17 Oct 2013 22:05:29 -0000 1.2 +++ HelicalTrackHitDriverTest.java 25 Oct 2013 20:29:03 -0000 1.3 @@ -24,7 +24,7 @@
import org.lcsim.recon.tracking.digitization.sisim.config.ReadoutCleanupDriver; import org.lcsim.util.test.TestUtil.TestOutputFile;
-import org.lcsim.hps.monitoring.CalibrationDriver;
+import org.lcsim.hps.conditions.CalibrationDriver;
import org.lcsim.hps.util.CompareHistograms; import org.freehep.record.loop.RecordLoop.Command;
@@ -33,7 +33,7 @@
/** * * @author Omar Moreno <[log in to unmask]>
- * $Id: HelicalTrackHitDriverTest.java,v 1.2 2013/10/17 22:05:29 omoreno Exp $
+ * $Id: HelicalTrackHitDriverTest.java,v 1.3 2013/10/25 20:29:03 jeremy Exp $
*/ public class HelicalTrackHitDriverTest extends TestCase {
diff -N MainTrackingDriver.java --- MainTrackingDriver.java 13 Jul 2013 00:19:19 -0000 1.5 +++ /dev/null 1 Jan 1970 00:00:00 -0000 @@ -1,40 +0,0 @@
-/* - * To change this template, choose Tools | Templates - * and open the template in the editor. - */ -package org.lcsim.hps.recon.tracking; - -import org.lcsim.hps.monitoring.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 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); - } - -}
Use REPLY-ALL to reply to list
To unsubscribe from the LCD-CVS list, click the following link:
https://listserv.slac.stanford.edu/cgi-bin/wa?SUBED1=LCD-CVS&A=1