diff -u -r1.56 -r1.57
--- JobControlManager.java	27 Mar 2012 03:08:41 -0000	1.56
+++ JobControlManager.java	8 Apr 2012 23:45:31 -0000	1.57
@@ -20,8 +20,8 @@

 import java.util.LinkedHashMap;
 import java.util.List;
 import java.util.Map;

-import java.util.Properties;

 import java.util.Map.Entry;

+import java.util.Properties;

 import java.util.regex.Matcher;
 import java.util.regex.Pattern;
 

@@ -32,10 +32,8 @@

 import org.apache.commons.cli.Options;
 import org.apache.commons.cli.ParseException;
 import org.apache.commons.cli.PosixParser;

-import org.freehep.application.studio.Studio;
-import org.freehep.jas.services.DynamicClassLoader;

 import org.freehep.record.loop.LoopSourceExhaustedException;

-import org.freehep.util.FreeHEPLookup;

+import org.freehep.record.loop.event.RecordSuppliedEvent;

 import org.jdom.Attribute;
 import org.jdom.Document;
 import org.jdom.Element;

@@ -44,11 +42,13 @@

 import org.jdom.output.Format;
 import org.jdom.output.XMLOutputter;
 import org.lcsim.LCSimVersion;

+import org.lcsim.event.EventHeader;

 import org.lcsim.units.Constants;
 import org.lcsim.util.Driver;
 import org.lcsim.util.DriverAdapter;
 import org.lcsim.util.cache.FileCache;
 import org.lcsim.util.loop.LCIOEventSource;

+import org.lcsim.util.loop.LCSimConditionsManagerImplementation;

 import org.lcsim.util.loop.LCSimLoop;
 import org.lcsim.util.xml.ClasspathEntityResolver;
 import org.lcsim.util.xml.JDOMExpressionFactory;

@@ -80,15 +80,14 @@

  * which it should be discarded.  If the {@link #run()} method is called twice on 
  * the same manager, a fatal exception will be thrown.
  *   

- * @version $Id: JobControlManager.java,v 1.56 2012/03/27 03:08:41 jeremy Exp $

+ * @version $Id: JobControlManager.java,v 1.57 2012/04/08 23:45:31 jeremy Exp $

  * @author Jeremy McCormick
  */
 // TODO Allow no input files when only Driver list is needed.

-// TODO Add job setting "checkInputFiles" which can be switched to false if input file existence should NOT be checked before job starts.

 public class JobControlManager
 {
     // The LCIO record loop.

-    private LCSimLoop loop = new LCSimLoop();

+    private LCSimLoop loop;

     
     // Driver management.
     private Map<String, Driver> driverMap = new LinkedHashMap<String, Driver>();

@@ -108,7 +107,6 @@

 	// Boolean job options.
     private boolean performDryRun;
     private boolean rewrite;

-    private boolean checkInputFilesExist = true;

     
     // Settings effecting logging verbosity.
     private boolean printInputFiles;

@@ -125,9 +123,6 @@

    
     // True once job parameters are setup from CL and XML.
     private boolean wasSetup;

-    
-    // Flag so that only one job is run by the manager.
-    private boolean ranJob;

         
 	// The manager's class loader.
 	private ClassLoader loader;	

@@ -148,30 +143,27 @@

 	// Reg exp to extract variables from a string with the form "${varName}".
 	private static final Pattern varPattern = Pattern.compile("[$][{][a-zA-Z_-]*[}]");
 	

+	private DriverAdapter driverAdapter = null;
+	

 	/**
 	 * The default constructor.
 	 */

-	public JobControlManager()
-	{
-	    try 
-	    {

+	public JobControlManager() {
+	    try {

 	        fileCache = new FileCache();

-	    }
-	    catch (IOException x)
-	    {

+	    } catch (IOException x) {

 	        throw new RuntimeException(x);
 	    }	    

+        LCSimConditionsManagerImplementation.register();

 	}
 	
 	/**
 	 * Run the manager using a main.  Takes command-line options (see class description).
 	 * @param args The command line arguments.
 	 */

-	public static void main(String args[])
-	{		

+	public static void main(String args[]) {		

 		JobControlManager mgr = new JobControlManager();

-        if (args.length == 0)
-        {

+        if (args.length == 0) {

             mgr.logStream.println("java -jar lcsim-bin.jar [options] steeringFile.xml");
             HelpFormatter help = new HelpFormatter();
             help.printHelp(" ", options);

@@ -228,52 +220,40 @@

 	    CommandLine cl = null;
 
 	    // Parse CL arguments.

-	    try 
-	    {

+	    try {

 	        cl = parser.parse(options, args);

-	    }
-	    catch (ParseException x)
-	    {
-	        throw new RuntimeException(x);

+	    } catch (ParseException x) {
+	        throw new RuntimeException("Problem parsing command line options.", x);

 	    }
 	    	    	    
 	    // Turn on verbose mode.  This setting may be overridden by control section from XML.

-        if (cl.hasOption("v"))
-        {           

+        if (cl.hasOption("v")) {           

             setVerbose(true);
         }
         // Turn on quiet mode.  If "-v" is also specified, this will have no effect. 

-        else if (cl.hasOption("q"))
-        {

+        else if (cl.hasOption("q")) {

             setVerbose(false);
         }
 	    
 	    // Load properties file containing variable definitions.

-	    if (cl.hasOption("p"))
-	    {

+	    if (cl.hasOption("p")) {

 	        String[] propValues = cl.getOptionValues("p");

-	        for (String propFileName : propValues)
-	        {

+	        for (String propFileName : propValues) {

 	            InputStream in = null;

-	            try 
-	            {

+	            try {

 	                 in = new FileInputStream(propFileName);
 	            }

-	            catch (FileNotFoundException e)
-	            {

+	            catch (FileNotFoundException e) {

 	                throw new RuntimeException(e);
 	            }
 	            Properties props = new Properties();

-	            try
-                {

+	            try {

                     props.load(in);
                 }

-                catch (IOException e)
-                {

+                catch (IOException e) {

                     throw new RuntimeException(e);
                 }

-                for (Entry<Object,Object> entry : props.entrySet())
-                {

+                for (Entry<Object,Object> entry : props.entrySet()) {

                     String key = (String) entry.getKey();
                     String value = (String) entry.getValue();
                     addVariableDefinition(key, value);

@@ -282,14 +262,11 @@

 	    }
 	    
 	    // Process user variable definitions.

-	    if (cl.hasOption("D"))
-	    {

+	    if (cl.hasOption("D")) {

 	        String[] defValues = cl.getOptionValues("D");

-	        for (String def : defValues)
-	        {

+	        for (String def : defValues) {

 	            String[] s = def.split("=");

-	            if (s.length != 2)
-	            {

+	            if (s.length != 2) {

 	                throw new RuntimeException("Bad variable format: " + def);
 	            }
 	            String key = s[0];

@@ -299,49 +276,40 @@

 	    }
 	    
 	    // Rewrite XML file with variables resolved.

-	    if (cl.hasOption("w"))
-	    {

+	    if (cl.hasOption("w")) {

 	        this.rewrite = true;
 	        String rewritePath = cl.getOptionValue("w");
 	        this.rewriteFile = new File(rewritePath);

-	        if (this.rewriteFile.exists())
-	        {

+	        if (this.rewriteFile.exists()) {

 	            throw new RuntimeException("Rewrite file already exists: " + rewritePath);
 	        }
 	    }
 	    
 	    // Set max number of events to run.

-	    if (cl.hasOption("n"))
-	    {

+	    if (cl.hasOption("n")) {

 	        this.maxEvents = Integer.valueOf(cl.getOptionValue("n"));
 	    }
 	    
 	    // Set number of events to skip. 

-	    if (cl.hasOption("s"))
-	    {

+	    if (cl.hasOption("s")) {

 	        this.skipEvents = Integer.valueOf(cl.getOptionValue("s"));
 	    }
 	    
 	    // Perform a dry run, not processing any events but doing job setup.

-	    if (cl.hasOption("x"))
-	    {

+	    if (cl.hasOption("x")) {

 	        this.performDryRun = true;
 	    }
 	    
 	    // The path to the XML steering file, which has no command switch.

-	    if (cl.getArgList().size() == 0)
-	    {

+	    if (cl.getArgList().size() == 0) {

 	        throw new RuntimeException("Missing LCSim XML file argument.");

-	    }
-	    else if (cl.getArgList().size() > 1)
-	    {

+	    } else if (cl.getArgList().size() > 1) {

 	        throw new RuntimeException("Too many extra arguments.");
 	    }	    
 	    
 	    // Setup the XML steering file and check for its existence.
 	    File xmlRunControlFile = new File((String) cl.getArgList().get(0));

-        if (!xmlRunControlFile.exists())
-        {

+        if (!xmlRunControlFile.exists()) {

             throw new RuntimeException("The steering file " + args[0] + " does not exist!");
         }
 	    

@@ -358,8 +326,7 @@

 	 */
 	public void addVariableDefinition(String key, String value)
 	{

-	    if (verbose)
-	    {

+	    if (verbose) {

 	        logStream.println(key + " = " + value);
 	    }
 	    if (!this.variableMap.containsKey(key))

@@ -373,86 +340,66 @@

 	}
 
 	/**

-	 * Execute a job using the current parameters.  This is publically accessible
-	 * in case the CL interface isn't being used and {@link #setup(File)} was called
-	 * manually.

+	 * Execute a job using the current parameters. 

 	 */

-	public void run()

+	public boolean run()

 	{

-	    // Only one job can be run with the manager, after which a new one should be created.
-	    if (this.ranJob)
-	    {
-	        throw new RuntimeException("Cannot run multiple jobs!  Create another JobManager.");
-	    }
-	    

 	    // If setup was not called first, then abort the job.

-		if (!wasSetup)
-		{
-			throw new RuntimeException("Aborting job!  The method JobManager.setup(File) was never called.");

+		if (!wasSetup) {
+			//throw new RuntimeException("Aborting job!  The method JobManager.setup(File) was never called.");
+			logStream.println("Aborting job!  Setup was never called.");
+		    return false;

 		}
 		

-		if (printVersion)
-		{			

+		if (printVersion) {			

 			(new LCSimVersion()).printOut(logStream);			
 			logStream.println();
 		}
 				

-		// Add the drivers to the loop.
-		for (Driver driver : driverExec)
-		{
-			loop.add(driver);
-		}

+		// Need to make sure loop is setup before running.
+		getLCSimLoop();

-		try
-		{

+		try {

 			// Add the LCIO files to the loop.

-			loop.setLCIORecordSource(new LCIOEventSource("test", inputFiles));

+			loop.setLCIORecordSource(new LCIOEventSource(this.getClass().getSimpleName(), inputFiles));

 			
 			// Driver statistics printout.
 			PrintStream statsStream = null;			

-			if (printDriverStatistics)
-			{

+			if (printDriverStatistics) {

 				statsStream = logStream;
 			}
 			

-			// Execute job if not a dry run.
-			if (!performDryRun)
-			{
-				if (verbose)
-				{

+			// Execute the entire job if not a dry run.
+			if (!performDryRun) {
+				if (verbose) {

 					logStream.println("Start time: " + (new Date()));
 					logStream.println();
 				}
 

-				if (skipEvents > 0)
-				{
-					if (verbose)
-					{

+				if (skipEvents > 0) {
+					if (verbose) {

 						logStream.println("Skipping " + skipEvents + " events.");
 					}
 					loop.skip(skipEvents);
 				}
 

-				// Execute the loop.

+				// Execute the loop.  

 				loop.loop(maxEvents, statsStream);
 

-				if (verbose)
-				{

+				if (verbose) {

 					logStream.println();
 					logStream.println("End time: " + (new Date()));
 				}
 			}
 			// A dry run does not process any events.  

-			else
-			{

+			else {

 			    // Always print this info msg.
 				logStream.println("Executed dry run.  No events processed!");
 			}
 		} 
 		// Record source was exhausted before max events was hit.  This is probably fine,
 		// but print message in case more were expected.

-		catch (LoopSourceExhaustedException x)
-		{

+		catch (LoopSourceExhaustedException x) {

 		    logStream.println(x.getMessage());
 		}
 		// Catch other fatal exceptions thrown from the loop.

@@ -463,17 +410,24 @@

 		
 		// Cleanup.
 		loop.dispose();

+		loop = null;

-		// Set flag so that manager is NOT reused for another job. 
-		this.ranJob = true;

+		// Job was successful.
+		return true;

 	}
 	
 	/**
 	 * Get the <code>LCSimLoop</code> of this JobManager.
 	 * @return The LCSimLoop.
 	 */

-	public LCSimLoop getLCSimLoop()
-	{

+	public LCSimLoop getLCSimLoop() {
+	    if (loop == null) {
+	        loop = new LCSimLoop();
+	        // Add the drivers to the loop.
+	        for (Driver driver : driverExec) {
+	            loop.add(driver);
+	        }
+	    }

 		return loop;
 	}
 	

@@ -483,8 +437,7 @@

 	 * method has been called.
 	 * @return A <code>List</code> of <code>Drivers</code>.
 	 */

-	public List<Driver> getDriverExecList()
-	{

+	public List<Driver> getDriverExecList() {

 		return this.driverExec;
 	}
 	

@@ -494,12 +447,9 @@

 	 */
 	public void setup(File file)
 	{

-		try
-		{

+		try {

 			setup((new FileInputStream(file)));

-		} 
-		catch (FileNotFoundException x)
-		{

+		} catch (FileNotFoundException x) {

 			throw new RuntimeException(x);
 		}
 	}

@@ -508,8 +458,7 @@

 	 * Setup job parameters from an embedded resource.
 	 * This method calls {@link #setup(InputStream)}.
 	 */

-	public void setup(String resourceURL)
-	{

+	public void setup(String resourceURL) {

 	    setup(this.getClass().getResourceAsStream(resourceURL));
 	}
 

@@ -517,8 +466,8 @@

 	 * Setup job parameters from an <code>InputStream</code> with XML text.	 
 	 * @param in The XML input stream.
 	 */

-	public void setup(InputStream in)
-	{

+	public void setup(InputStream in) {
+	    

 	    // Make the Document builder.
 		SAXBuilder builder = new SAXBuilder();
 		

@@ -532,12 +481,9 @@

 		
 		// Build the document.
 		Document doc = null;

-		try
-		{

+		try {

 			doc = builder.build(in);

-		} 
-		catch (Exception x)
-		{

+		} catch (Exception x) {

 			throw new RuntimeException(x);
 		}
 				        			

@@ -555,8 +501,10 @@

      */
     private void setup(Document doc)
     {  

-        if (wasSetup)
-            throw new RuntimeException("Setup was already called!");

+        if (wasSetup) {
+            logStream.println("Ignoring call to setup as it was already called.");
+            return;
+        }

         
         // Set the root element.
         root = doc.getRootElement();

@@ -566,8 +514,7 @@

         
         // Rewrite XML after variable substitution.  Correctness of values,
         // such as existence of input file paths, is NOT checked.

-        if (this.rewrite)
-        {

+        if (this.rewrite) {

             rewriteXMLSteering(doc);
         }
                 

@@ -575,8 +522,7 @@

         setupJobControlParameters();
 
         // Print system properties.

-        if (printSystemProperties)
-        {

+        if (printSystemProperties) {

             printSystemProperties(logStream);
         }
         

@@ -637,8 +583,8 @@

 	        match.reset();
 	        
 	        // Loop over the matches.

-            while (match.find())
-            {

+            while (match.find()) {
+                

                 // Variable string with ${...} enclosure included.
                 String var = match.group();
                 

@@ -663,8 +609,7 @@

 	    }
 	    
 	    // Recursively process all child elements of this one.

-	    for (Iterator it = element.getChildren().iterator(); it.hasNext(); )
-	    {

+	    for (Iterator it = element.getChildren().iterator(); it.hasNext(); ) {

 	        substituteVariables((Element)it.next());
 	    }
 	}

@@ -674,22 +619,17 @@

 	 * The output path is set by command line argument to "-w". 
 	 * @param doc The XML steering doc with variables substituted.
 	 */

-	private void rewriteXMLSteering(Document doc)
-	{
-	    if (verbose)
-	    {

+	private void rewriteXMLSteering(Document doc) {
+	    if (verbose) {

 	        logStream.println("Rewriting XML to " + this.rewriteFile + " ...");
 	    }
 	    XMLOutputter outputter = new XMLOutputter();
 	    outputter.setFormat(Format.getPrettyFormat());	    

-	    try 
-	    {

+	    try {

 	        FileOutputStream out = new FileOutputStream(this.rewriteFile);
 	        outputter.output(doc, out);
 	        out.close();

-	    }
-	    catch (Exception e)
-	    {

+	    } catch (Exception e) {

 	        throw new RuntimeException(e);
 	    }
 	}

@@ -700,15 +640,14 @@

      */
     private void setupDrivers()
     {

-        if (printDriversDetailed)
-        {

+        if (printDriversDetailed) {

             logStream.println("--- Drivers ---");
         }
         
         // Loop over the list of driver elements.
         List<Element> drivers = root.getChild("drivers").getChildren("driver");

-        for (Element driver : drivers)
-        {

+        for (Element driver : drivers) {
+            

             // Get the name of the Driver.
             String name = driver.getAttributeValue("name");
 

@@ -716,8 +655,7 @@

             String type = driver.getAttributeValue("type");
 
             // Translate from a short name (optional).

-            if (availableDrivers.get(type) != null)
-            {

+            if (availableDrivers.get(type) != null) {

                 type = availableDrivers.get(type);
             }
 

@@ -727,12 +665,9 @@

             
             // Class of the Driver.
             Class driverClass;

-            try 
-            {

+            try {

                 driverClass = loader.loadClass(type);

-            }
-            catch (ClassNotFoundException x)
-            {

+            } catch (ClassNotFoundException x) {

                 throw new RuntimeException("The Driver class " + type + " was not found.", x);
             }
             

@@ -741,17 +676,13 @@

                                     
             // The Driver instance.
             Driver newDriver;

-            try 
-            {

+            try {

                 newDriver = (Driver) driverClass.newInstance();
             }

-            catch (InstantiationException x)
-            {

+            catch (InstantiationException x) {

                 throw new RuntimeException("Failed to create a Driver of class " + type + ".  " +
                         "This class might be missing a public constructor with no arguments.",x);

-            }
-            catch (IllegalAccessException x)
-            {

+            } catch (IllegalAccessException x) {

                 throw new RuntimeException("Cannot access Driver type " + type + ". " +
                         "You may need to make this class or its constructor public.",x);
             }

@@ -760,8 +691,7 @@

             List<Element> parameters = driver.getChildren();
 
             // Process the parameters.

-            for (Element parameterElement : parameters)
-            {

+            for (Element parameterElement : parameters) {

                 // The parameter's setter method that we will find.
                 Method setter = null;
                 

@@ -775,34 +705,30 @@

                 // Find setter methods that look like good matches for this parameter.
                 List<Method> methods = getSetterMethods(driverClass);
                 List<Method> methodCandidates = new ArrayList<Method>();

-                for (Method method : methods)
-                {                                  

+                for (Method method : methods) {                                  

                     String propHack = method.getName().replaceFirst("set", "");