 |
 |
| Commit in hps-java/src/main on MAIN | |||
| resources/org/lcsim/hps/steering/DataQuality.lcsim | +3 | -3 | 1.1 -> 1.2 |
| java/org/lcsim/hps/evio/TestRunEvioToLcio.java | +12 | -7 | 1.25 -> 1.26 |
| resources/org/lcsim/hps/steering/recon/TestRunOfflineRecon.lcsim | +1 | -4 | 1.2 -> 1.3 |
| +16 | -14 | ||
option to run TestRunEvioToLcio with steering files from resources
diff -u -r1.1 -r1.2 --- DataQuality.lcsim 22 Feb 2013 01:32:22 -0000 1.1 +++ DataQuality.lcsim 7 Mar 2013 03:14:41 -0000 1.2 @@ -1,13 +1,13 @@
<!-- Quick summary of file contents, to be run after readout simulation or reconstruction. @author Sho Uemura <[log in to unmask]>
- @version $Id: DataQuality.lcsim,v 1.1 2013/02/22 01:32:22 meeg Exp $
+ @version $Id: DataQuality.lcsim,v 1.2 2013/03/07 03:14:41 meeg Exp $
-->
<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>
+<!-- <printInputFiles>true</printInputFiles>--> +<!-- <printDriversDetailed>true</printDriversDetailed>-->
</control>
<execute>
<driver name="CollectionSizeDriver"/>
diff -u -r1.25 -r1.26 --- TestRunEvioToLcio.java 25 Feb 2013 22:39:25 -0000 1.25 +++ TestRunEvioToLcio.java 7 Mar 2013 03:14:41 -0000 1.26 @@ -52,8 +52,9 @@
options.addOption(new Option("s", true, "Sleep duration between events (in ms)"));
options.addOption(new Option("n", true, "Stop after N events"));
options.addOption(new Option("w", false, "Wait after end of data"));
- options.addOption(new Option("r", false, "Show run control window"));
+ options.addOption(new Option("c", false, "Show run control window"));
options.addOption(new Option("D", true, "Pass a variable to the steering file"));
+ options.addOption(new Option("r", false, "Interpret -x argument as a steering resource instead of a file path"));
return options;
}
@@ -111,14 +112,18 @@
if ("".equals(detectorName)) {
throw new RuntimeException("You need to specify a valid detector name as input, use the -d option");
}
-
+
// LCSim XML file to execute inline.
if (cl.hasOption("x")) {
String lcsimXmlName = cl.getOptionValue("x");
- try {
- steeringStream = new FileInputStream(lcsimXmlName);
- } catch (FileNotFoundException e) {
- throw new RuntimeException(e);
+ if (cl.hasOption("r")) {
+ steeringStream = TestRunEvioToLcio.class.getResourceAsStream(lcsimXmlName);
+ } else {
+ try {
+ steeringStream = new FileInputStream(lcsimXmlName);
+ } catch (FileNotFoundException e) {
+ throw new RuntimeException(e);
+ }
}
}
@@ -138,7 +143,7 @@
RunControlDialog runControl = null;
- if (cl.hasOption("r")) {
+ if (cl.hasOption("c")) {
runControl = new RunControlDialog();
}
diff -u -r1.2 -r1.3 --- TestRunOfflineRecon.lcsim 6 Mar 2013 02:36:43 -0000 1.2 +++ TestRunOfflineRecon.lcsim 7 Mar 2013 03:14:41 -0000 1.3 @@ -1,8 +1,5 @@
<lcsim xmlns:xs="http://www.w3.org/2001/XMLSchema-instance"
xs:noNamespaceSchemaLocation="http://www.lcsim.org/schemas/lcsim/1.0/lcsim.xsd">
- <control> - <numberOfEvents>-1</numberOfEvents> - </control>
<execute>
<driver name="EventMarkerDriver"/>
<driver name="CalibrationDriver"/>
@@ -49,7 +46,7 @@
</driver>
<driver name="LCIOWriter"
type="org.lcsim.util.loop.LCIODriver">
- <outputFilePath>${outputFile}</outputFilePath>
+ <outputFilePath>${outputFile}.slcio</outputFilePath>
</driver>
</drivers>
</lcsim>
Use REPLY-ALL to reply to list
To unsubscribe from the LCD-CVS list, click the following link:
https://listserv.slac.stanford.edu/cgi-bin/wa?SUBED1=LCD-CVS&A=1