lcio/src/java/hep/lcio/util
diff -u -r1.9 -r1.10
--- MergeCommandHandler.java 31 Jan 2007 19:27:44 -0000 1.9
+++ MergeCommandHandler.java 1 Feb 2007 19:33:24 -0000 1.10
@@ -20,7 +20,7 @@
* passes the results to a method from MergeUtil.
*
* @author jeremym
- * @version $Id: MergeCommandHandler.java,v 1.9 2007/01/31 19:27:44 jeremy Exp $
+ * @version $Id: MergeCommandHandler.java,v 1.10 2007/02/01 19:33:24 jeremy Exp $
*/
public class MergeCommandHandler extends CommandHandler
{
@@ -156,7 +156,13 @@
// Set the maximum number of merged events.
if (cl.hasOption("n"))
{
- this.def_ntoread = Integer.parseInt(cl.getOptionValue("n"));
+ maxevents = Integer.parseInt(cl.getOptionValue("n"));
+ }
+
+ // Set the maximum number of merged events.
+ if (cl.hasOption("e"))
+ {
+ def_ntoread = Integer.parseInt(cl.getOptionValue("n"));
}
}
@@ -165,6 +171,7 @@
*/
public void execute() throws Exception
{
+ System.out.println("maxevents="+maxevents);
MergeUtil.mergeFiles(outfile, mergeFiles, maxevents);
}