Author: [log in to unmask]
Date: Mon Nov 17 16:27:32 2014
New Revision: 1559
Log:
Set log level of DatabaseConditionsManager to WARNING in integration-tests to reduce print outs.
Modified:
java/trunk/integration-tests/src/test/java/org/hps/MCFilteredReconTest.java
java/trunk/integration-tests/src/test/java/org/hps/MockDataReconTest.java
java/trunk/integration-tests/src/test/java/org/hps/ReadoutNoPileupTest.java
java/trunk/integration-tests/src/test/java/org/hps/ReadoutToEvioTest.java
java/trunk/integration-tests/src/test/java/org/hps/ReadoutToLcioTest.java
java/trunk/integration-tests/src/test/java/org/hps/ReconClusterICTest.java
java/trunk/integration-tests/src/test/java/org/hps/SimpleMCReconTest.java
java/trunk/integration-tests/src/test/java/org/hps/SimpleSvtReadoutTest.java
java/trunk/integration-tests/src/test/java/org/hps/TestRunReadoutToEvioTest.java
java/trunk/integration-tests/src/test/java/org/hps/TestRunReconTest.java
Modified: java/trunk/integration-tests/src/test/java/org/hps/MCFilteredReconTest.java
=============================================================================
--- java/trunk/integration-tests/src/test/java/org/hps/MCFilteredReconTest.java (original)
+++ java/trunk/integration-tests/src/test/java/org/hps/MCFilteredReconTest.java Mon Nov 17 16:27:32 2014
@@ -4,9 +4,11 @@
import java.net.URL;
import java.util.ArrayList;
import java.util.List;
+import java.util.logging.Level;
import junit.framework.TestCase;
+import org.hps.conditions.database.DatabaseConditionsManager;
import org.hps.job.JobManager;
import org.hps.readout.ecal.FADCEcalReadoutDriver;
import org.hps.users.meeg.FilterMCBunches;
@@ -63,7 +65,8 @@
System.out.print("Created filtered MC file " + filteredOutputFile.getPath());
// 2) Run readout simulation.
- JobManager job = new JobManager();
+ JobManager job = new JobManager();
+ DatabaseConditionsManager.getInstance().setLogLevel(Level.WARNING);
File readoutOutputFile = new TestOutputFile(this.getClass().getSimpleName() + File.separator + this.getClass().getSimpleName() + "_readout");
job.addVariableDefinition("outputFile", readoutOutputFile.getPath());
job.addInputFile(filteredOutputFile);
Modified: java/trunk/integration-tests/src/test/java/org/hps/MockDataReconTest.java
=============================================================================
--- java/trunk/integration-tests/src/test/java/org/hps/MockDataReconTest.java (original)
+++ java/trunk/integration-tests/src/test/java/org/hps/MockDataReconTest.java Mon Nov 17 16:27:32 2014
@@ -3,9 +3,11 @@
import java.io.File;
import java.io.IOException;
import java.net.URL;
+import java.util.logging.Level;
import junit.framework.TestCase;
+import org.hps.conditions.database.DatabaseConditionsManager;
import org.hps.job.JobManager;
import org.hps.users.jeremym.MockDataChallengeDiagnosticDriver;
import org.lcsim.event.Cluster;
@@ -92,6 +94,7 @@
System.out.println("running recon using steering resource " + steeringResource);
JobManager jobManager = new JobManager();
+ DatabaseConditionsManager.getInstance().setLogLevel(Level.WARNING);
jobManager.addVariableDefinition("outputFile", outputFile.getPath());
jobManager.addInputFile(mockDataFile);
jobManager.setup(steeringResource);
Modified: java/trunk/integration-tests/src/test/java/org/hps/ReadoutNoPileupTest.java
=============================================================================
--- java/trunk/integration-tests/src/test/java/org/hps/ReadoutNoPileupTest.java (original)
+++ java/trunk/integration-tests/src/test/java/org/hps/ReadoutNoPileupTest.java Mon Nov 17 16:27:32 2014
@@ -2,9 +2,11 @@
import java.io.File;
import java.net.URL;
+import java.util.logging.Level;
import junit.framework.TestCase;
+import org.hps.conditions.database.DatabaseConditionsManager;
import org.hps.job.JobManager;
import org.lcsim.util.cache.FileCache;
import org.lcsim.util.test.TestUtil.TestOutputFile;
@@ -35,6 +37,7 @@
File inputFile = cache.getCachedFile(new URL("http://www.lcsim.org/test/hps-java/ReadoutNoPileupTest.slcio"));
JobManager job = new JobManager();
+ DatabaseConditionsManager.getInstance().setLogLevel(Level.WARNING);
job.addInputFile(inputFile);
File outputFile = new TestOutputFile(this.getClass().getSimpleName() + File.separator + this.getClass().getSimpleName() + "_readout");
job.addVariableDefinition("outputFile", outputFile.getPath());
Modified: java/trunk/integration-tests/src/test/java/org/hps/ReadoutToEvioTest.java
=============================================================================
--- java/trunk/integration-tests/src/test/java/org/hps/ReadoutToEvioTest.java (original)
+++ java/trunk/integration-tests/src/test/java/org/hps/ReadoutToEvioTest.java Mon Nov 17 16:27:32 2014
@@ -2,9 +2,11 @@
import java.io.File;
import java.net.URL;
+import java.util.logging.Level;
import junit.framework.TestCase;
+import org.hps.conditions.database.DatabaseConditionsManager;
import org.hps.job.JobManager;
import org.lcsim.util.cache.FileCache;
import org.lcsim.util.test.TestUtil.TestOutputFile;
@@ -32,6 +34,7 @@
File inputFile = cache.getCachedFile(new URL("http://www.lcsim.org/test/hps-java/ReadoutToEvioTest.slcio"));
JobManager job = new JobManager();
+ DatabaseConditionsManager.getInstance().setLogLevel(Level.WARNING);
job.addInputFile(inputFile);
File outputFile = new TestOutputFile(this.getClass().getSimpleName() + File.separator + this.getClass().getSimpleName() + "_readout");
job.addVariableDefinition("outputFile", outputFile.getPath());
Modified: java/trunk/integration-tests/src/test/java/org/hps/ReadoutToLcioTest.java
=============================================================================
--- java/trunk/integration-tests/src/test/java/org/hps/ReadoutToLcioTest.java (original)
+++ java/trunk/integration-tests/src/test/java/org/hps/ReadoutToLcioTest.java Mon Nov 17 16:27:32 2014
@@ -2,9 +2,11 @@
import java.io.File;
import java.net.URL;
+import java.util.logging.Level;
import junit.framework.TestCase;
+import org.hps.conditions.database.DatabaseConditionsManager;
import org.hps.job.JobManager;
import org.lcsim.util.cache.FileCache;
import org.lcsim.util.test.TestUtil.TestOutputFile;
@@ -33,6 +35,7 @@
File inputFile = cache.getCachedFile(new URL("http://www.lcsim.org/test/hps-java/ReadoutToLcioTest.slcio"));
JobManager job = new JobManager();
+ DatabaseConditionsManager.getInstance().setLogLevel(Level.WARNING);
job.addInputFile(inputFile);
File outputFile = new TestOutputFile(this.getClass().getSimpleName() + File.separator + this.getClass().getSimpleName());
job.addVariableDefinition("outputFile", outputFile.getPath());
Modified: java/trunk/integration-tests/src/test/java/org/hps/ReconClusterICTest.java
=============================================================================
--- java/trunk/integration-tests/src/test/java/org/hps/ReconClusterICTest.java (original)
+++ java/trunk/integration-tests/src/test/java/org/hps/ReconClusterICTest.java Mon Nov 17 16:27:32 2014
@@ -3,9 +3,11 @@
import java.io.File;
import java.io.IOException;
import java.net.URL;
+import java.util.logging.Level;
import junit.framework.TestCase;
+import org.hps.conditions.database.DatabaseConditionsManager;
import org.hps.job.JobManager;
import org.hps.users.jeremym.MockDataChallengeDiagnosticDriver;
import org.lcsim.event.Cluster;
@@ -80,6 +82,7 @@
System.out.println("running recon using steering resource " + steeringResource);
JobManager jobManager = new JobManager();
+ DatabaseConditionsManager.getInstance().setLogLevel(Level.WARNING);
jobManager.addVariableDefinition("outputFile", outputFile.getPath());
jobManager.addInputFile(mockDataFile);
jobManager.setup(steeringResource);
Modified: java/trunk/integration-tests/src/test/java/org/hps/SimpleMCReconTest.java
=============================================================================
--- java/trunk/integration-tests/src/test/java/org/hps/SimpleMCReconTest.java (original)
+++ java/trunk/integration-tests/src/test/java/org/hps/SimpleMCReconTest.java Mon Nov 17 16:27:32 2014
@@ -3,9 +3,11 @@
import java.io.File;
import java.io.IOException;
import java.net.URL;
+import java.util.logging.Level;
import junit.framework.TestCase;
+import org.hps.conditions.database.DatabaseConditionsManager;
import org.hps.job.JobManager;
import org.lcsim.event.CalorimeterHit;
import org.lcsim.event.Cluster;
@@ -32,6 +34,7 @@
// Run the reconstruction.
JobManager job = new JobManager();
+ DatabaseConditionsManager.getInstance().setLogLevel(Level.WARNING);
File outputFile = new TestOutputFile(this.getClass().getSimpleName() + File.separator + this.getClass().getSimpleName() + "_recon");
job.addVariableDefinition("outputFile", outputFile.getPath());
job.addInputFile(inputFile);
Modified: java/trunk/integration-tests/src/test/java/org/hps/SimpleSvtReadoutTest.java
=============================================================================
--- java/trunk/integration-tests/src/test/java/org/hps/SimpleSvtReadoutTest.java (original)
+++ java/trunk/integration-tests/src/test/java/org/hps/SimpleSvtReadoutTest.java Mon Nov 17 16:27:32 2014
@@ -3,9 +3,11 @@
import java.io.File;
import java.net.URL;
import java.util.List;
+import java.util.logging.Level;
import junit.framework.TestCase;
+import org.hps.conditions.database.DatabaseConditionsManager;
import org.hps.job.JobManager;
import org.lcsim.event.EventHeader;
import org.lcsim.event.RawTrackerHit;
@@ -45,6 +47,7 @@
FinalCheckDriver checker = new FinalCheckDriver();
JobManager job = new JobManager();
+ DatabaseConditionsManager.getInstance().setLogLevel(Level.WARNING);
job.addInputFile(inputFile);
job.addVariableDefinition("outputFile", outputFile.getPath());
job.setup("/org/hps/steering/readout/HPS2014TruthReadoutToLcio.lcsim");
Modified: java/trunk/integration-tests/src/test/java/org/hps/TestRunReadoutToEvioTest.java
=============================================================================
--- java/trunk/integration-tests/src/test/java/org/hps/TestRunReadoutToEvioTest.java (original)
+++ java/trunk/integration-tests/src/test/java/org/hps/TestRunReadoutToEvioTest.java Mon Nov 17 16:27:32 2014
@@ -2,6 +2,7 @@
import java.io.File;
import java.net.URL;
+import java.util.logging.Level;
import junit.framework.TestCase;
@@ -29,6 +30,7 @@
File inputFile = cache.getCachedFile(new URL("http://www.lcsim.org/test/hps-java/TestRunReadoutToEvioTest.slcio"));
JobManager job = new JobManager();
+ DatabaseConditionsManager.getInstance().setLogLevel(Level.WARNING);
DatabaseConditionsManager conditionsManager = DatabaseConditionsManager.getInstance();
DatabaseConditionsManager.getInstance().setDetector("HPS-TestRun-v5", 1351);
conditionsManager.freeze();
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 Mon Nov 17 16:27:32 2014
@@ -29,7 +29,7 @@
public class TestRunReconTest extends TestCase {
final static String fileLocation = "http://www.lcsim.org/test/hps-java/TestRunEvioToLcioTest.evio";
- static String inputFileName = "/nfs/slac/g/hps3/data/testrun/runs/evio/hps_001351.evio.0";
+ //static String inputFileName = "/nfs/slac/g/hps3/data/testrun/runs/evio/hps_001351.evio.0";
public void testTestRunRecon() throws Exception {
@@ -41,7 +41,6 @@
File inputFile = cache.getCachedFile(new URL(fileLocation));
// Run TestRunEvioToLcio using the standard org.lcsim steering file.
- //File inputFile = new File(inputFileName);
List<String> argList = new ArrayList<String>();
argList.add("-r");
argList.add("-x");
