Print

---

Author: [log in to unmask]
Date: Fri Nov 14 12:54:58 2014
New Revision: 1524

Log:
Use new EVIO to LCIO utility.

Modified:
    java/trunk/integration-tests/src/test/java/org/hps/TestRunEvioToLcioTest.java
    java/trunk/integration-tests/src/test/java/org/hps/TestRunReconTest.java

Modified: java/trunk/integration-tests/src/test/java/org/hps/TestRunEvioToLcioTest.java
 =============================================================================
--- java/trunk/integration-tests/src/test/java/org/hps/TestRunEvioToLcioTest.java	(original)
+++ java/trunk/integration-tests/src/test/java/org/hps/TestRunEvioToLcioTest.java	Fri Nov 14 12:54:58 2014
@@ -5,7 +5,7 @@
 
 import junit.framework.TestCase;
 
-import org.hps.evio.TestRunEvioToLcio;
+import org.hps.evio.EvioToLcio;
 import org.lcsim.util.cache.FileCache;
 import org.lcsim.util.test.TestUtil.TestOutputFile;
 
@@ -30,13 +30,11 @@
                 "-D",
                 "outputFile=" + new TestOutputFile("TestRunEvioToLcioTest").getPath(),
                 inputFile.getPath(),
-                "-R",
-                "1351",
                 "-n",
                 "100"
         };
         System.out.println("Running TestRunEvioToLcio.main ...");
-        TestRunEvioToLcio.main(args);
+        EvioToLcio.main(args);
     }
 
 }

Modified: java/trunk/integration-tests/src/test/java/org/hps/TestRunReconTest.java
 =============================================================================
--- java/trunk/integration-tests/src/test/java/org/hps/TestRunReconTest.java	(original)
+++ java/trunk/integration-tests/src/test/java/org/hps/TestRunReconTest.java	Fri Nov 14 12:54:58 2014
@@ -8,7 +8,7 @@
 
 import junit.framework.TestCase;
 
-import org.hps.evio.TestRunEvioToLcio;
+import org.hps.evio.EvioToLcio;
 import org.lcsim.event.CalorimeterHit;
 import org.lcsim.event.Cluster;
 import org.lcsim.event.EventHeader;
@@ -49,13 +49,11 @@
         argList.add("-d");
         argList.add("HPS-TestRun-v8-5");
         argList.add("-D");
-        argList.add("runNumber=1351");
-        argList.add("-D");
         File outputFile = new TestOutputFile(getClass().getSimpleName() + File.separator + getClass().getSimpleName() + "_recon");
         argList.add("outputFile=" + outputFile.getPath());
         argList.add(inputFile.getPath());
-        System.out.println("Running TestRunEvioToLcio.main ...");
-        TestRunEvioToLcio.main(argList.toArray(new String[] {}));
+        System.out.println("Running EvioToLcio.main ...");
+        EvioToLcio.main(argList.toArray(new String[] {}));
         
         // Read in the LCIO event file and print out summary information.
         System.out.println("Running ReconCheckDriver on output ...");