Author: [log in to unmask]
Date: Sat Jan  3 18:09:59 2015
New Revision: 1844

Log:
Remove usage of CalibrationDriver.

Modified:
    java/trunk/tracking/src/test/java/org/hps/recon/tracking/HelicalTrackHitDriverTest.java
    java/trunk/tracking/src/test/java/org/hps/recon/tracking/TestRunTrackReconTest.java
    java/trunk/tracking/src/test/java/org/hps/recon/tracking/TrackRecoFromScratchTest.java
    java/trunk/tracking/src/test/java/org/hps/recon/tracking/TruthResidualTest.java
    java/trunk/users/src/main/java/org/hps/users/jeremym/TestRunReconDriver.java
    java/trunk/users/src/main/java/org/hps/users/mgraham/MainJASDriver.java

Modified: java/trunk/tracking/src/test/java/org/hps/recon/tracking/HelicalTrackHitDriverTest.java
 =============================================================================
--- java/trunk/tracking/src/test/java/org/hps/recon/tracking/HelicalTrackHitDriverTest.java	(original)
+++ java/trunk/tracking/src/test/java/org/hps/recon/tracking/HelicalTrackHitDriverTest.java	Sat Jan  3 18:09:59 2015
@@ -14,7 +14,6 @@
 import junit.framework.TestCase;
 
 import org.freehep.record.loop.RecordLoop.Command;
-import org.hps.conditions.deprecated.CalibrationDriver;
 import org.hps.util.CompareHistograms;
 import org.lcsim.event.EventHeader;
 import org.lcsim.fit.helicaltrack.HelicalTrackHit;
@@ -76,7 +75,6 @@
         // Specify the drivers that will run
         LCSimLoop lcsimLoop = new LCSimLoop();
         lcsimLoop.setLCIORecordSource(lcioInputFile);
-        lcsimLoop.add(new CalibrationDriver());
         lcsimLoop.add(new RawTrackerHitSensorSetup());
         lcsimLoop.add(hitFitter);
         lcsimLoop.add(new DataTrackerHitDriver());

Modified: java/trunk/tracking/src/test/java/org/hps/recon/tracking/TestRunTrackReconTest.java
 =============================================================================
--- java/trunk/tracking/src/test/java/org/hps/recon/tracking/TestRunTrackReconTest.java	(original)
+++ java/trunk/tracking/src/test/java/org/hps/recon/tracking/TestRunTrackReconTest.java	Sat Jan  3 18:09:59 2015
@@ -15,7 +15,6 @@
 
 import junit.framework.TestCase;
 
-import org.hps.conditions.deprecated.CalibrationDriver;
 import org.hps.util.CompareHistograms;
 import org.lcsim.event.EventHeader;
 import org.lcsim.event.Track;
@@ -205,9 +204,6 @@
         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());
             RawTrackerHitFitterDriver hitfitter = new RawTrackerHitFitterDriver();
             hitfitter.setFitAlgorithm("Analytic");

Modified: java/trunk/tracking/src/test/java/org/hps/recon/tracking/TrackRecoFromScratchTest.java
 =============================================================================
--- java/trunk/tracking/src/test/java/org/hps/recon/tracking/TrackRecoFromScratchTest.java	(original)
+++ java/trunk/tracking/src/test/java/org/hps/recon/tracking/TrackRecoFromScratchTest.java	Sat Jan  3 18:09:59 2015
@@ -28,7 +28,6 @@
         LCSimLoop loop = new LCSimLoop();
         loop.setLCIORecordSource(lcioInputFile);
 
-        loop.add(new org.hps.conditions.deprecated.CalibrationDriver());
         loop.add(new org.hps.recon.tracking.SimpleTrackerDigiDriver());
         loop.add(new org.hps.recon.tracking.HelicalTrackHitDriver());
         loop.add(new org.hps.recon.tracking.TrackerReconDriver());

Modified: java/trunk/tracking/src/test/java/org/hps/recon/tracking/TruthResidualTest.java
 =============================================================================
--- java/trunk/tracking/src/test/java/org/hps/recon/tracking/TruthResidualTest.java	(original)
+++ java/trunk/tracking/src/test/java/org/hps/recon/tracking/TruthResidualTest.java	Sat Jan  3 18:09:59 2015
@@ -14,7 +14,6 @@
 
 import junit.framework.TestCase;
 
-import org.hps.conditions.deprecated.CalibrationDriver;
 import org.hps.recon.tracking.gbl.TruthResiduals;
 import org.lcsim.event.EventHeader;
 import org.lcsim.event.MCParticle;
@@ -124,9 +123,6 @@
         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());
             RawTrackerHitFitterDriver hitfitter = new RawTrackerHitFitterDriver();
             hitfitter.setFitAlgorithm("Analytic");

Modified: java/trunk/users/src/main/java/org/hps/users/jeremym/TestRunReconDriver.java
 =============================================================================
--- java/trunk/users/src/main/java/org/hps/users/jeremym/TestRunReconDriver.java	(original)
+++ java/trunk/users/src/main/java/org/hps/users/jeremym/TestRunReconDriver.java	Sat Jan  3 18:09:59 2015
@@ -1,6 +1,5 @@
 package org.hps.users.jeremym;
 
-import org.hps.conditions.deprecated.CalibrationDriver;
 import org.hps.recon.ecal.EcalClusterer;
 import org.hps.recon.ecal.EcalRawConverterDriver;
 import org.hps.recon.tracking.DataTrackerHitDriver;
@@ -27,10 +26,6 @@
 public class TestRunReconDriver extends Driver {
     
     public TestRunReconDriver() {
-        
-        //CalibrationDriver calibrationDriver = new CalibrationDriver();
-        //calibrationDriver.setRunNumber(975);
-        //this.add(calibrationDriver);
         
         RawTrackerHitSensorSetup rawTrackerHitDriver = new RawTrackerHitSensorSetup();
         this.add(rawTrackerHitDriver);
@@ -82,4 +77,4 @@
     public void startOfData() {
         super.startOfData();
     }
-}
+}

Modified: java/trunk/users/src/main/java/org/hps/users/mgraham/MainJASDriver.java
 =============================================================================
--- java/trunk/users/src/main/java/org/hps/users/mgraham/MainJASDriver.java	(original)
+++ java/trunk/users/src/main/java/org/hps/users/mgraham/MainJASDriver.java	Sat Jan  3 18:09:59 2015
@@ -1,6 +1,5 @@
 package org.hps.users.mgraham;
 
-import org.hps.conditions.deprecated.CalibrationDriver;
 import org.hps.recon.tracking.DataTrackerHitDriver;
 import org.hps.recon.tracking.RawTrackerHitFitterDriver;
 import org.hps.recon.tracking.HelicalTrackHitDriver;
@@ -19,7 +18,6 @@
 
     public MainJASDriver() {
 //        add(new HPSSVTSensorSetup());
-        //add(new CalibrationDriver());
         add(new RawTrackerHitSensorSetup());
         //   Can remove HPSRawTrackerHitFitterDriver and DataTrackerHitDriver for integrated MC
         RawTrackerHitFitterDriver hitfitter=new RawTrackerHitFitterDriver();