2 removed + 7 modified, total 9 files
java/trunk/integration-tests
--- java/trunk/integration-tests/pom.xml 2014-10-16 23:08:50 UTC (rev 1239)
+++ java/trunk/integration-tests/pom.xml 2014-10-17 00:06:04 UTC (rev 1240)
@@ -28,7 +28,6 @@
<configuration>
<excludes>
<exclude>org/hps/EtSystemTest.java</exclude>
- <exclude>org/hps/TestRunReconTest.java</exclude>
</excludes>
<redirectTestOutputToFile>true</redirectTestOutputToFile>
<trimStackTrace>true</trimStackTrace>
@@ -54,7 +53,33 @@
</plugin>
</plugins>
</build>
- </profile>
+ </profile>
+ <profile>
+ <id>fast-integration-tests</id>
+ <activation>
+ <activeByDefault>false</activeByDefault>
+ </activation>
+ <build>
+ <plugins>
+ <plugin>
+ <groupId>org.apache.maven.plugins</groupId>
+ <artifactId>maven-surefire-plugin</artifactId>
+ <configuration>
+ <excludes>
+ <exclude>org/hps/EcalReadoutSimTest.java</exclude>
+ <exclude>org/hps/EtSystemTest.java</exclude>
+ <exclude>org/hps/HPSTestRunTracker2014GeometryTrackReconTest.java</exclude>
+ <exclude>org/hps/MCFilteredReconTest.java</exclude>
+ <exclude>org/hps/MockDataReconTest.java</exclude>
+ <exclude>org/hps/ReadoutNoPileupTest.java</exclude>
+ <exclude>org/hps/ReconClusterICTest.java</exclude>
+ <exclude>org/hps/TestRunReconTest.java</exclude>
+ </excludes>
+ </configuration>
+ </plugin>
+ </plugins>
+ </build>
+ </profile>
<!-- This profile activates automatically when not running tests on a SLAC Unix system with NFS access. -->
<profile>
<id>no-slac-nfs</id>
java/trunk/integration-tests/src/test/java/org/hps
--- java/trunk/integration-tests/src/test/java/org/hps/EcalReadoutSimTest.java 2014-10-16 23:08:50 UTC (rev 1239)
+++ java/trunk/integration-tests/src/test/java/org/hps/EcalReadoutSimTest.java 2014-10-17 00:06:04 UTC (rev 1240)
@@ -7,7 +7,6 @@
import java.io.IOException;
import java.io.InputStream;
import java.io.InputStreamReader;
-import java.net.URL;
import java.util.ArrayList;
import java.util.Collections;
import java.util.List;
@@ -24,7 +23,6 @@
import org.lcsim.job.JobControlManager;
import org.lcsim.util.Driver;
import org.lcsim.util.aida.AIDA;
-import org.lcsim.util.cache.FileCache;
import org.lcsim.util.loop.LCSimLoop;
/**
java/trunk/integration-tests/src/test/java/org/hps
--- java/trunk/integration-tests/src/test/java/org/hps/MCReconTest.java 2014-10-16 23:08:50 UTC (rev 1239)
+++ java/trunk/integration-tests/src/test/java/org/hps/MCReconTest.java 2014-10-17 00:06:04 UTC (rev 1240)
@@ -1,103 +0,0 @@
-package org.hps;
-
-import java.io.File;
-import java.net.URL;
-import java.util.logging.Level;
-import java.util.logging.Logger;
-
-import junit.framework.TestCase;
-
-import org.hps.recon.tracking.RawTrackerHitFitterDriver;
-import org.lcsim.event.CalorimeterHit;
-import org.lcsim.event.Cluster;
-import org.lcsim.event.EventHeader;
-import org.lcsim.event.ReconstructedParticle;
-import org.lcsim.event.Track;
-import org.lcsim.event.TrackerHit;
-import org.lcsim.job.JobControlManager;
-import org.lcsim.util.Driver;
-import org.lcsim.util.cache.FileCache;
-import org.lcsim.util.test.TestUtil.TestOutputFile;
-
-/**
- * Run the reconstruction on output from the readout simulation.
- *
- * @author Jeremy McCormick <[log in to unmask]>
- */
-public class MCReconTest extends TestCase {
-
- static final String fileLocation = "http://www.lcsim.org/test/hps-java/MCReconTest.slcio";
-
- public void testMCRecon() throws Exception {
-
- new TestOutputFile(this.getClass().getSimpleName()).mkdirs();
-
- File reconOutputFile = new TestOutputFile(this.getClass().getSimpleName()
- + File.separator + this.getClass().getSimpleName() + "_recon");
-
- FileCache cache = new FileCache();
- File inputFile = cache.getCachedFile(new URL(fileLocation));
-
- System.out.println("Running MC recon on " + inputFile.getPath() + " ...");
- JobControlManager job = new JobControlManager();
- job.addVariableDefinition("outputFile", reconOutputFile.getPath());
- job.addInputFile(inputFile);
- job.setup("/org/hps/steering/test/MCReconTest.lcsim");
- ReconCheckDriver reconCheckDriver = new ReconCheckDriver();
- job.getLCSimLoop().add(reconCheckDriver);
- for (Driver driver : job.getDriverAdapter().getDriver().drivers()) {
- System.out.println(driver.getClass().getCanonicalName());
- if (driver instanceof RawTrackerHitFitterDriver) {
- ((RawTrackerHitFitterDriver)driver).setDebug(false);
- }
- }
- Logger.getLogger("org.freehep.math.minuit").setLevel(Level.OFF);
- long startMillis = System.currentTimeMillis();
- job.run();
- long elapsedMillis = System.currentTimeMillis() - startMillis;
- long nevents = job.getLCSimLoop().getTotalSupplied();
- System.out.println("MC recon processed " + job.getLCSimLoop().getTotalSupplied() + " events.");
- System.out.print("MC recon took " + ((double)elapsedMillis/1000L) + " seconds");
- System.out.println(" which is " + ((double)elapsedMillis / (double)nevents) + " ms per event.");
- job.getLCSimLoop().dispose();
- }
-
- static class ReconCheckDriver extends Driver {
-
- int nTracks;
- int nClusters;
- int nTrackerHits;
- int nCalorimeterHits;
- int nReconstructedParticles;
- int nEvents;
-
- public void process(EventHeader event) {
- ++nEvents;
- if (event.hasCollection(Track.class, "MatchedTracks")) {
- nTracks += event.get(Track.class, "MatchedTracks").size();
- }
- if (event.hasCollection(Cluster.class, "EcalClusters")) {
- nClusters += event.get(Cluster.class, "EcalClusters").size();
- }
- if (event.hasCollection(TrackerHit.class, "RotatedHelicalTrackHits")) {
- nTrackerHits += event.get(TrackerHit.class, "RotatedHelicalTrackHits").size();
- }
- if (event.hasCollection(CalorimeterHit.class, "EcalCalHits")) {
- nCalorimeterHits += event.get(CalorimeterHit.class, "EcalCalHits").size();
- }
- if (event.hasCollection(ReconstructedParticle.class, "FinalStateParticles")) {
- nReconstructedParticles += event.get(ReconstructedParticle.class, "FinalStateParticles").size();
- }
- }
-
- public void endOfData() {
- System.out.println("ReconCheckDriver results ...");
- System.out.println(" nEvents: " + nEvents);
- System.out.println(" nTracks: " + nTracks);
- System.out.println(" nClusters: " + nClusters);
- System.out.println(" nTrackerHits: " + nTrackerHits);
- System.out.println(" nCalorimeterHits: " + nCalorimeterHits);
- System.out.println(" nReconstructedParticles: " + nReconstructedParticles);
- }
- }
-}
java/trunk/integration-tests/src/test/java/org/hps
--- java/trunk/integration-tests/src/test/java/org/hps/ReadoutNoPileupTest.java 2014-10-16 23:08:50 UTC (rev 1239)
+++ java/trunk/integration-tests/src/test/java/org/hps/ReadoutNoPileupTest.java 2014-10-17 00:06:04 UTC (rev 1240)
@@ -25,7 +25,9 @@
* @author Jeremy McCormick <[log in to unmask]>
*/
public class ReadoutNoPileupTest extends TestCase {
-
+
+ static final int nEvents = 100;
+
public void testReadoutNoPileup() throws Exception {
new TestOutputFile(this.getClass().getSimpleName()).mkdir();
@@ -37,6 +39,7 @@
File outputFile = new TestOutputFile(this.getClass().getSimpleName() + File.separator + this.getClass().getSimpleName() + "_readout");
job.addVariableDefinition("outputFile", outputFile.getPath());
job.setup("/org/hps/steering/readout/HPS2014ReadoutNoPileup.lcsim");
+ job.setNumberOfEvents(nEvents);
job.run();
}
}
java/trunk/integration-tests/src/test/java/org/hps
--- java/trunk/integration-tests/src/test/java/org/hps/ReadoutToEvioTest.java 2014-10-16 23:08:50 UTC (rev 1239)
+++ java/trunk/integration-tests/src/test/java/org/hps/ReadoutToEvioTest.java 2014-10-17 00:06:04 UTC (rev 1240)
@@ -23,6 +23,8 @@
*/
public class ReadoutToEvioTest extends TestCase {
+ static final int nEvents = 100;
+
public void testReadoutToEvio() throws Exception {
new TestOutputFile(this.getClass().getSimpleName()).mkdir();
@@ -34,6 +36,7 @@
File outputFile = new TestOutputFile(this.getClass().getSimpleName() + File.separator + this.getClass().getSimpleName() + "_readout");
job.addVariableDefinition("outputFile", outputFile.getPath());
job.setup("/org/hps/steering/readout/HPS2014ReadoutToEvio.lcsim");
+ job.setNumberOfEvents(nEvents);
job.run();
}
}
java/trunk/integration-tests/src/test/java/org/hps
--- java/trunk/integration-tests/src/test/java/org/hps/ReadoutToLcioTest.java 2014-10-16 23:08:50 UTC (rev 1239)
+++ java/trunk/integration-tests/src/test/java/org/hps/ReadoutToLcioTest.java 2014-10-17 00:06:04 UTC (rev 1240)
@@ -22,7 +22,9 @@
* @author Jeremy McCormick <[log in to unmask]>
*/
public class ReadoutToLcioTest extends TestCase {
-
+
+ static final int nEvents = 100;
+
public void testReadoutToLcio() throws Exception {
new TestOutputFile(this.getClass().getSimpleName()).mkdir();
@@ -35,6 +37,7 @@
File outputFile = new TestOutputFile(this.getClass().getSimpleName() + File.separator + this.getClass().getSimpleName());
job.addVariableDefinition("outputFile", outputFile.getPath());
job.setup("/org/hps/steering/readout/HPS2014ReadoutToLcio.lcsim");
+ job.setNumberOfEvents(nEvents);
job.run();
}
java/trunk/integration-tests/src/test/java/org/hps
--- java/trunk/integration-tests/src/test/java/org/hps/SimpleMCReconTest.java 2014-10-16 23:08:50 UTC (rev 1239)
+++ java/trunk/integration-tests/src/test/java/org/hps/SimpleMCReconTest.java 2014-10-17 00:06:04 UTC (rev 1240)
@@ -21,6 +21,8 @@
public class SimpleMCReconTest extends TestCase {
+ static final int nEvents = 100;
+
public void testSimpleMCReconTest() throws Exception {
new TestOutputFile(this.getClass().getSimpleName()).mkdir();
@@ -34,6 +36,7 @@
job.addVariableDefinition("outputFile", outputFile.getPath());
job.addInputFile(inputFile);
job.setup("/org/hps/steering/recon/SimpleMCRecon.lcsim");
+ job.setNumberOfEvents(nEvents);
job.run();
// Read in the LCIO event file and print out summary information.
@@ -86,14 +89,13 @@
public void endOfData() {
System.out.println("ReconCheckDriver results ...");
System.out.println(" nEvents: " + nEvents);
- System.out.println(" nTracks: " + nTracks);
+ System.out.println(" nSimCalorimeterHits: " + nSimCalorimeterHits);
System.out.println(" nClusters: " + nClusters);
- System.out.println(" nTrackerHits: " + nTrackerHits);
- System.out.println(" nSimCalorimeterHits: " + nSimCalorimeterHits);
- System.out.println(" nCalorimeterHits: " + nCalorimeterHits);
+ System.out.println(" nTrackerHits: " + nTrackerHits);
+ System.out.println(" nTracks: " + nTracks);
System.out.println(" nReconstructedParticles: " + nReconstructedParticles);
- System.out.println(" nTracks / nEvents = " + (double)nTracks / (double)nEvents);
- System.out.println(" nClusters / nEvents = " + (double)nClusters / (double)nEvents);
+ System.out.println(" < nTracks / nEvents > = " + (double)nTracks / (double)nEvents);
+ System.out.println(" < nClusters / nEvents > = " + (double)nClusters / (double)nEvents);
}
}
}
\ No newline at end of file
java/trunk/integration-tests/src/test/java/org/hps
--- java/trunk/integration-tests/src/test/java/org/hps/TestRunReadoutToEvioTest.java 2014-10-16 23:08:50 UTC (rev 1239)
+++ java/trunk/integration-tests/src/test/java/org/hps/TestRunReadoutToEvioTest.java 2014-10-17 00:06:04 UTC (rev 1240)
@@ -17,7 +17,9 @@
* @author Jeremy McCormick <[log in to unmask]>
*/
public class TestRunReadoutToEvioTest extends TestCase {
-
+
+ static final int nEvents = 100;
+
public void testTestRunReadoutToEvio() throws Exception {
new TestOutputFile(this.getClass().getSimpleName()).mkdir();
@@ -31,6 +33,7 @@
job.addVariableDefinition("outputFile", outputFile.getPath());
job.addVariableDefinition("runNumber", "1351");
job.setup("/org/hps/steering/readout/TestRunReadoutToEvio.lcsim");
+ job.setNumberOfEvents(nEvents);
job.run();
}
}
java/trunk/integration-tests/src/test/resources/org/hps/steering/test
--- java/trunk/integration-tests/src/test/resources/org/hps/steering/test/MCReconTest.lcsim 2014-10-16 23:08:50 UTC (rev 1239)
+++ java/trunk/integration-tests/src/test/resources/org/hps/steering/test/MCReconTest.lcsim 2014-10-17 00:06:04 UTC (rev 1240)
@@ -1,60 +0,0 @@
-<lcsim xmlns:xs="http://www.w3.org/2001/XMLSchema-instance"
- xs:noNamespaceSchemaLocation="http://www.lcsim.org/schemas/lcsim/1.0/lcsim.xsd">
- <control>
- <printInputFiles>true</printInputFiles>
- <printDriversDetailed>true</printDriversDetailed>
- </control>
- <execute>
- <driver name="EventMarkerDriver"/>
- <driver name="CalibrationDriver"/>
- <driver name="TrackerDigiDriver"/>
- <driver name="HelicalTrackHitDriver"/>
- <driver name="TrackerReconDriver"/>
- <driver name="EcalRawConverter" />
- <driver name="EcalClusterer" />
- <driver name="ReconParticle" />
- <driver name="TrackDataDriver" />
- <driver name="GBLDriver"/>
- <driver name="LCIOWriter"/>
- </execute>
- <drivers>
- <driver name="CalibrationDriver" type="org.hps.conditions.deprecated.CalibrationDriver"/>
- <driver name="EventMarkerDriver" type="org.lcsim.job.EventMarkerDriver">
- <eventInterval>10</eventInterval>
- </driver>
- <driver name="TrackerDigiDriver" type="org.hps.recon.tracking.SimpleTrackerDigiDriver">
- <debug>false</debug>
- </driver>
- <driver name="HelicalTrackHitDriver" type="org.hps.recon.tracking.HelicalTrackHitDriver">
- <debug>false</debug>
- <maxSeperation>20.0</maxSeperation>
- <tolerance>1.0</tolerance>
- </driver>
- <driver name="TrackerReconDriver" type="org.hps.recon.tracking.TrackerReconDriver">
- <debug>false</debug>
- <strategyResource>/org/hps/recon/tracking/strategies/HPS-Full.xml</strategyResource>
- </driver>
- <driver name="GBLDriver" type="org.hps.recon.tracking.gbl.GBLOutputDriver">
- <debug>1</debug>
- <isMC>false</isMC>
- <gblFileName></gblFileName>
- </driver>
- <driver name="EcalRawConverter" type="org.hps.recon.ecal.EcalRawConverterDriver">
- <ecalCollectionName>EcalCalHits</ecalCollectionName>
- <use2014Gain>false</use2014Gain>
- <useTimestamps>false</useTimestamps>
- <useTruthTime>true</useTruthTime>
- </driver>
- <driver name="EcalClusterer" type="org.hps.recon.ecal.EcalClusterICBasic">
- <ecalName>Ecal</ecalName>
- <ecalCollectionName>EcalCalHits</ecalCollectionName>
- <timeCut>false</timeCut>
- </driver>
- <driver name="ReconParticle" type="org.hps.recon.particle.HpsReconParticleDriver"/>
- <driver name="TrackDataDriver" type="org.hps.recon.tracking.TrackDataDriver" />
- <driver name="LCIOWriter" type="org.lcsim.util.loop.LCIODriver">
- <outputFilePath>${outputFile}</outputFilePath>
- </driver>
- </drivers>
-</lcsim>
-
SVNspam 0.1