projects/lcsim/trunk/job-manager/src/main/java/org/lcsim/job

--- projects/lcsim/trunk/job-manager/src/main/java/org/lcsim/job/JobControlManager.java	2014-10-14 07:47:51 UTC (rev 3366)
+++ projects/lcsim/trunk/job-manager/src/main/java/org/lcsim/job/JobControlManager.java	2014-10-16 23:48:30 UTC (rev 3367)
@@ -99,7 +99,7 @@

 
     // Run parameters.
     private List<File> inputFiles = new ArrayList<File>();

-    private int maxEvents = -1;

+    private int numberOfEvents = -1;

     private int skipEvents = -1;
     private File rewriteFile;
 

@@ -282,7 +282,7 @@

 
         // Set max number of events to run.
         if (cl.hasOption("n")) {

-            this.maxEvents = Integer.valueOf(cl.getOptionValue("n"));

+            this.numberOfEvents = Integer.valueOf(cl.getOptionValue("n"));

         }
 
         // Set number of events to skip.

@@ -415,8 +415,8 @@

             }
 
             // Execute the loop.

-            long processedEvents = loop.loop(maxEvents, statsStream);
-            if (processedEvents != maxEvents) {

+            long processedEvents = loop.loop(numberOfEvents, statsStream);
+            if (processedEvents != numberOfEvents) {

                 logStream.println("End of file reached");
             } else if (verbose) {
                 logStream.println();

@@ -1079,9 +1079,9 @@

         // Number of events to run.
         Element controlElement = control.getChild("numberOfEvents");
         if (controlElement != null) {

-            maxEvents = Integer.valueOf(controlElement.getText());

+            numberOfEvents = Integer.valueOf(controlElement.getText());

             if (verbose)

-                logStream.println("numberOfEvents = " + maxEvents);

+                logStream.println("numberOfEvents = " + numberOfEvents);

         }
 
         Element skipElement = control.getChild("skipEvents");

@@ -1365,7 +1365,7 @@

 
         // Run parameters.
         inputFiles = new ArrayList<File>();

-        maxEvents = -1;

+        numberOfEvents = -1;

         skipEvents = -1;
 
         rewriteFile = null;

@@ -1513,4 +1513,13 @@

         }
         return driver;
     }

+    
+    /**
+     * Set the number of events to run on the loop before ending the job.  
+     * This should be called after the {@link #setup(File)} method
+     * is called or it will be overridden.     
+     */
+    public void setNumberOfEvents(int numberOfEvents) {        
+        this.numberOfEvents = numberOfEvents;
+    }

 }