Print

---

Author: [log in to unmask]
Date: Mon Jan  5 14:27:19 2015
New Revision: 1866

Log: (empty)

Added:
    java/sandbox/ECalGainDriver.java
      - copied unchanged from r1863, java/trunk/users/src/main/java/org/hps/users/phansson/ECalGainDriver.java
    java/sandbox/EcalCrystalFilter.java
      - copied unchanged from r1863, java/trunk/users/src/main/java/org/hps/users/phansson/EcalCrystalFilter.java
    java/sandbox/MultScatAnalysis.java
      - copied unchanged from r1863, java/trunk/users/src/main/java/org/hps/users/phansson/MultScatAnalysis.java
    java/sandbox/TrigRateDriver.java
      - copied unchanged from r1863, java/trunk/users/src/main/java/org/hps/users/phansson/TrigRateDriver.java
    java/sandbox/broken_tests/EcalReadoutSimTest.java
      - copied, changed from r1522, java/trunk/integration-tests/src/test/java/org/hps/EcalReadoutSimTest.java
    java/sandbox/ecalGainAna.java
      - copied unchanged from r1863, java/trunk/users/src/main/java/org/hps/users/phansson/ecalGainAna.java
Modified:
    java/sandbox/broken/FakeHitTracking.lcsim

Modified: java/sandbox/broken/FakeHitTracking.lcsim
 =============================================================================
--- java/sandbox/broken/FakeHitTracking.lcsim	(original)
+++ java/sandbox/broken/FakeHitTracking.lcsim	Mon Jan  5 14:27:19 2015
@@ -9,7 +9,6 @@
     <inputFiles>
         <!--<file>${inputFile}</file>-->
     </inputFiles>
-
     <control>
         <printInputFiles>true</printInputFiles>
         <printDriversDetailed>true</printDriversDetailed>

Copied: java/sandbox/broken_tests/EcalReadoutSimTest.java (from r1522, java/trunk/integration-tests/src/test/java/org/hps/EcalReadoutSimTest.java)
 =============================================================================
--- java/trunk/integration-tests/src/test/java/org/hps/EcalReadoutSimTest.java	(original)
+++ java/sandbox/broken_tests/EcalReadoutSimTest.java	Mon Jan  5 14:27:19 2015
@@ -12,6 +12,8 @@
 
 import junit.framework.TestCase;
 
+import org.hps.conditions.database.DatabaseConditionsManager;
+import org.hps.job.JobManager;
 import org.lcsim.event.EventHeader;
 import org.lcsim.event.GenericObject;
 import org.lcsim.event.LCRelation;
@@ -19,7 +21,6 @@
 import org.lcsim.event.RawCalorimeterHit;
 import org.lcsim.event.RawTrackerHit;
 import org.lcsim.job.AidaSaveDriver;
-import org.lcsim.job.JobControlManager;
 import org.lcsim.util.Driver;
 import org.lcsim.util.aida.AIDA;
 import org.lcsim.util.cache.FileCache;
@@ -141,7 +142,7 @@
         }
                 
         // Run the readout simulation.
-        JobControlManager job = new JobControlManager();
+        JobManager job = new JobManager();
         job.addInputFile(inputFile);        
         job.addVariableDefinition("runNumber", new Integer(runNumber).toString());
         job.addVariableDefinition("outputFile", outputFile.getPath());