Author: jeremym
Date: Fri Feb 5 14:54:25 2016
New Revision: 4168
Log:
Minor cleanup of DQM test.
Modified:
java/trunk/integration-tests/src/test/java/org/hps/test/it/DataQualityMonitorTest.java
java/trunk/integration-tests/src/test/resources/org/hps/steering/test/DataQualityTest.lcsim
Modified: java/trunk/integration-tests/src/test/java/org/hps/test/it/DataQualityMonitorTest.java
=============================================================================
--- java/trunk/integration-tests/src/test/java/org/hps/test/it/DataQualityMonitorTest.java (original)
+++ java/trunk/integration-tests/src/test/java/org/hps/test/it/DataQualityMonitorTest.java Fri Feb 5 14:54:25 2016
@@ -17,16 +17,14 @@
private static final String CLASS_NAME = DataQualityMonitorTest.class.getSimpleName();
private static final File OUTPUT_DIR = new File("./target/test-output/" + CLASS_NAME);
- private static final File OUTPUT_FILE = new File(OUTPUT_DIR.getAbsolutePath() + File.separator + CLASS_NAME);
- private static final File AIDA_FILE = new File(OUTPUT_FILE.getAbsolutePath() + ".aida");
+ private static final File OUTPUT_FILE = new File(OUTPUT_DIR.getAbsolutePath() + File.separator + CLASS_NAME + ".aida");
private static final String STEERING_RESOURCE = "/org/hps/steering/test/DataQualityTest.lcsim";
public void setUp() {
- System.out.println("Setting up DQM Test");
// Delete files if they already exist.
- if (AIDA_FILE.exists())
- AIDA_FILE.delete();
+ if (OUTPUT_FILE.exists())
+ OUTPUT_FILE.delete();
// Create output dir.
OUTPUT_DIR.mkdirs();
@@ -36,11 +34,12 @@
public void testQualityMonitor() {
File dataFile = new TestDataUtility().getTestData("DataQualityMonitorTest.slcio");
- System.out.println("running data quality job with steering resource " + STEERING_RESOURCE);
+ System.out.println("running data quality job with steering resource " + STEERING_RESOURCE + " ...");
JobManager jobManager = new JobManager();
jobManager.addVariableDefinition("outputFile", OUTPUT_FILE.getPath());
jobManager.addInputFile(dataFile);
jobManager.setup(STEERING_RESOURCE);
jobManager.run();
+ System.out.println("Done!");
}
}
Modified: java/trunk/integration-tests/src/test/resources/org/hps/steering/test/DataQualityTest.lcsim
=============================================================================
--- java/trunk/integration-tests/src/test/resources/org/hps/steering/test/DataQualityTest.lcsim (original)
+++ java/trunk/integration-tests/src/test/resources/org/hps/steering/test/DataQualityTest.lcsim Fri Feb 5 14:54:25 2016
@@ -18,13 +18,12 @@
<driver name="CleanupDriver"/>
</execute>
<drivers>
- <!-- <driver name="DQMDatabaseDriver" type="org.hps.analysis.dataquality.DQMDatabaseDriver"/> -->
<driver name="EventMarkerDriver" type="org.lcsim.job.EventMarkerDriver">
- <eventInterval>1</eventInterval>
+ <eventInterval>100</eventInterval>
</driver>
<driver name="RawTrackerHitSensorSetup" type="org.lcsim.recon.tracking.digitization.sisim.config.RawTrackerHitSensorSetup"/>
<driver name="AidaSaveDriver" type="org.lcsim.job.AidaSaveDriver">
- <outputFileName>${outputFile}.root</outputFileName>
+ <outputFileName>${outputFile}</outputFileName>
</driver>
<driver name="SVTMonitoring" type="org.hps.analysis.dataquality.SvtMonitoring">
<overwriteDB>false</overwriteDB>
@@ -48,6 +47,5 @@
<overwriteDB>false</overwriteDB>
</driver>
<driver name="CleanupDriver" type="org.lcsim.recon.tracking.digitization.sisim.config.ReadoutCleanupDriver"/>
-
</drivers>
</lcsim>
