LISTSERV 16.5 - LCD-CVS Archives

- _fileName = (new File(path)).getAbsolutePath(); - int pos = path.lastIndexOf(".aida"); - if (pos != path.length() - 5) - { - _fileName += ".aida"; - } - System.out.println("file: " + _fileName);

+ //_fileName = (new File(path)).getRelativePath(); + _fileName = path; + //int pos = path.lastIndexOf(".aida"); + //System.out.println("pos="+pos); + //if (pos == -1 || (pos != path.length() - 5)) + //{ + // _fileName += ".aida"; + //} + //System.out.println("file: " + _fileName);

SlicDiagnostics/src/org/lcsim/slic/diagnostics/util

CommandLineProcessor.java 1.1 -> 1.2

diff -u -r1.1 -r1.2
--- CommandLineProcessor.java	13 Jan 2007 00:18:22 -0000	1.1
+++ CommandLineProcessor.java	7 Mar 2008 01:26:05 -0000	1.2
@@ -28,7 +28,7 @@

  * Main.
  * 
  * @author Jeremy McCormick

- * @version $Id: CommandLineProcessor.java,v 1.1 2007/01/13 00:18:22 jeremy Exp $

+ * @version $Id: CommandLineProcessor.java,v 1.2 2008/03/07 01:26:05 jeremy Exp $

  */
 public class CommandLineProcessor
 {

@@ -95,6 +95,10 @@

         opt = new Option("d", false, "add a search directory for file patterns (no pattern uses *.slcio)");
         opt.setArgs(1);
         _options.addOption(opt);

+        
+        opt = new Option("D", false, "output directory");
+        opt.setArgs(1);
+        _options.addOption(opt);

 
         opt = new Option("r", false, "add a pattern to match files in directories (no directories uses current dir)");
         opt.setArgs(1);

@@ -135,23 +139,18 @@

             _userOptions = new UserOptions();
         }

-        // Write out the current options to a properties file.
-        if ( cl.hasOption("P"))
-        {
-            _userOptions.toFile(cl.getOptionValue("P"));
-        }

         
         // Verbosity, overriding setting from properties file, if exists
         if (cl.hasOption("v"))
         {
             _verbosity = Integer.parseInt(cl.getOptionValue("v"));

-            _userOptions.setIntegerOption("verbosity", _verbosity);

+            _userOptions.setIntegerOption("config.verbosity", _verbosity);

         }
         
         // Max events
         if (cl.hasOption("n"))
         {

-            _userOptions.setIntegerOption("maxEvents",Integer.parseInt(cl.getOptionValue("n")));

+            _userOptions.setIntegerOption("config.maxEvents",Integer.parseInt(cl.getOptionValue("n")));

         }
         
         // Process lists of files

@@ -240,6 +239,12 @@

             }
         }

+        // Write out the current options to a properties file.
+        if ( cl.hasOption("P"))
+        {
+            _userOptions.toFile(cl.getOptionValue("P"));
+        }
+

         // If running in verbose mode, print out the results from command line
         // arguments that have been processed, thusfar.
         if (_verbosity > 0)

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

         // Output file from command-line.
         if (cl.hasOption("o"))
         {

-        	System.out.println("filename from command line");

+        	//System.out.println("filename from command line");

         	
         	// Override possible UserOption setting.
         	_userOptions.setStringOption("config.outputFile",cl.getOptionValue("o"));

@@ -290,15 +295,21 @@

         // Output file is autonamed.
         else 
         {

-        	if (cl.hasOption("-O") || _userOptions.getBooleanOption("config.autoname"))

+        	if (cl.hasOption("O") || _userOptions.getBooleanOption("config.autoname"))

-        		System.out.println("filename from autoname");

+        		//System.out.println("filename from autoname");

         		
         		// Override possible UserOption setting.
         		_userOptions.setStringOption("config.outputFile", _infiles.get(0).toString().replace(".slcio", ""));
         	}
         }

+        if (cl.hasOption("D"))
+        {        	
+        	_userOptions.setStringOption("config.outputDir",cl.getOptionValue("D"));
+        	System.out.println("-D = " + _userOptions.getStringOption("config.outputDir"));
+        }
+

         // If neither of above 2 are selected for output filename,
         // the user's outputFile option from properties is kept 
         // or the default, e.g. hard-coded, filename is used.

@@ -316,7 +327,7 @@

                 ++nfiles;
             }

-            System.out.println("config.outputFile="+_userOptions.getStringOption("config.outputFile"));

+            //System.out.println("config.outputFile="+_userOptions.getStringOption("config.outputFile"));

         }
     }

parseBooleanOption("tracker.hit",false); parseBooleanOption("tracker.generic",false); parseBooleanOption("mcparticle.generator",false); parseBooleanOption("mcparticle.simulator",false); parseBooleanOption("mcparticle.statusPlots",false);

+ //String outDir = (new File(".")).getAbsolutePath(); + //outDir = outDir.substring(0,outDir.length()-2); + parseStringOption("config.outputDir",(new File(".")).getAbsolutePath()); + parseBooleanOption("config.convertClouds",false);

Commit in `SlicDiagnostics` on MAIN
`build.sh`	+1	-1	1.3 -> 1.4
`test.properties`	+1		1.3 -> 1.4
`src/org/lcsim/slic/diagnostics/Main.java`	+3	-3	1.14 -> 1.15
`/SlicDiagnosticsDriver.java`	+22	-14	1.27 -> 1.28
`src/org/lcsim/slic/diagnostics/util/CommandLineProcessor.java`	+23	-12	1.1 -> 1.2
`/Runner.java`	+3	-2	1.2 -> 1.3
`/UserOptions.java`	+12	-5	1.6 -> 1.7
	+65	-37