hps-java/src/main/java/org/lcsim/hps/evio

diff -u -r1.6 -r1.7
--- TestRunEvioToLcio.java	1 May 2012 17:42:04 -0000	1.6
+++ TestRunEvioToLcio.java	1 May 2012 18:20:19 -0000	1.7
@@ -41,13 +41,13 @@

     private static Options createCommandLineOptions() {
         Options options = new Options();
 

-        Option evioFileOpt = new Option("e", false, "Deprecated: The input EVIO file containing Test Run data.");

+        //Option evioFileOpt = new Option("e", false, "Deprecated: The input EVIO file containing Test Run data.");

         Option lcioFileOpt = new Option("l", true, "The name of the output LCIO file.");
         Option detectorNameOpt = new Option("d", true, "The name of the detector to use for LCSim conditions.");
         Option lcsimXmlOpt = new Option("x", true, "The LCSim XML file to process the LCIO events.");
         Option sleepOpt = new Option("s", true, "Sleep duration between events (in ms)");
 

-        options.addOption(evioFileOpt);

+        //options.addOption(evioFileOpt);

         options.addOption(lcioFileOpt);
         options.addOption(detectorNameOpt);
         options.addOption(lcsimXmlOpt);

@@ -68,7 +68,7 @@

         // Set up command line parsing.
         Options options = createCommandLineOptions();
         if (args.length == 0) {

-            System.out.println("TestRunEvioToLcio [options]");

+            System.out.println("TestRunEvioToLcio [options] [evioFiles]");

             HelpFormatter help = new HelpFormatter();
             help.printHelp(" ", options);
             System.exit(1);

@@ -90,9 +90,9 @@

         int sleepTime = -1;
 
         // Remind people not to use -e any more

-        if (cl.hasOption("e")) {
-            System.out.println("Option -e is deprecated; EVIO file name is now a non-option argument");
-        }

+        //if (cl.hasOption("e")) {
+        //    System.out.println("Option -e is deprecated; EVIO file name is now a non-option argument");
+        //}

 
         // LCIO output file.
         if (cl.hasOption("l")) {

@@ -176,10 +176,10 @@

                     if (reader.getNumEventsRemaining() == 0) {
                         break;
                     }

-                } catch (EvioException e) {
-                    throw new RuntimeException(e);
-                } catch (IOException e) {
-                    throw new RuntimeException(e);

+                } catch (Exception e) {
+                    // Catch all event processing errors and continue.
+                    e.printStackTrace();
+                    continue;

                 }
                 if (sleepTime > 0) {
                     try {