Author: [log in to unmask]
Date: Tue Nov 3 14:41:17 2015
New Revision: 3937
Log:
Merge recent changes from trunk.
Modified:
java/branches/jeremy-dev/ (props changed)
java/branches/jeremy-dev/conditions/ (props changed)
java/branches/jeremy-dev/conditions/src/main/java/org/hps/conditions/cli/AbstractCommand.java
java/branches/jeremy-dev/conditions/src/main/java/org/hps/conditions/cli/CommandLineTool.java
java/branches/jeremy-dev/conditions/src/main/java/org/hps/conditions/run/RunSpreadsheet.java
java/branches/jeremy-dev/conditions/src/main/java/org/hps/conditions/svt/MotorPositionLoader.java
java/branches/jeremy-dev/conditions/src/main/java/org/hps/conditions/svt/SvtBiasConditionsLoader.java
java/branches/jeremy-dev/conditions/src/main/java/org/hps/conditions/svt/SvtConditionsLoader.java
java/branches/jeremy-dev/crawler/pom.xml
java/branches/jeremy-dev/crawler/src/main/java/org/hps/crawler/DatacatCrawler.java
java/branches/jeremy-dev/evio/src/main/java/org/hps/evio/BasicEvioFileReader.java
java/branches/jeremy-dev/evio/src/main/java/org/hps/evio/EvioToLcio.java
java/branches/jeremy-dev/logging/src/main/resources/org/hps/logging/config/logging.properties
java/branches/jeremy-dev/logging/src/main/resources/org/hps/logging/config/test_logging.properties
java/branches/jeremy-dev/monitoring-app/ (props changed)
java/branches/jeremy-dev/monitoring-app/src/main/java/org/hps/monitoring/application/Main.java
java/branches/jeremy-dev/parent/pom.xml
java/branches/jeremy-dev/record-util/src/main/java/org/hps/record/evio/EvioEventSkimmer.java
java/branches/jeremy-dev/record-util/src/main/java/org/hps/record/evio/EvioFileProducer.java
java/branches/jeremy-dev/run-database/src/main/java/org/hps/run/database/RunDatabaseCommandLine.java
java/branches/jeremy-dev/tracking/src/main/java/org/hps/recon/tracking/gbl/GBLRefitterDriver.java
java/branches/jeremy-dev/tracking/src/main/java/org/hps/recon/tracking/gbl/GblUtils.java
java/branches/jeremy-dev/tracking/src/main/java/org/hps/svt/alignment/BuildCompact.java
java/branches/jeremy-dev/tracking/src/main/java/org/hps/svt/alignment/BuildMillepedeCompact.java
java/branches/jeremy-dev/users/src/main/java/org/hps/users/jeremym/EvioFileScanner.java
java/branches/jeremy-dev/users/src/main/java/org/hps/users/meeg/FilterMCBunches.java
java/branches/jeremy-dev/users/src/main/java/org/hps/users/meeg/MergeMCBunches.java
java/branches/jeremy-dev/users/src/main/java/org/hps/users/meeg/SvtChargeIntegrator.java
java/branches/jeremy-dev/users/src/main/java/org/hps/users/omoreno/LheToStdhep.java
java/branches/jeremy-dev/users/src/main/java/org/hps/users/phansson/DumpAIDATextFiles.java
java/branches/jeremy-dev/users/src/main/java/org/hps/users/phansson/dataMCPlots.java
java/branches/jeremy-dev/users/src/main/java/org/hps/users/phansson/ecalPlots.java
java/branches/jeremy-dev/users/src/main/java/org/hps/users/phansson/mergeSimpleAIDA.java
java/branches/jeremy-dev/users/src/main/java/org/hps/users/phansson/trigRate.java
java/branches/jeremy-dev/util/src/main/java/org/hps/util/CalculateAcceptanceFromMadGraph.java
java/branches/jeremy-dev/util/src/main/java/org/hps/util/ConvertToStdhep.java
java/branches/jeremy-dev/util/src/main/java/org/hps/util/DumpLHEEventsToASCII.java
Modified: java/branches/jeremy-dev/conditions/src/main/java/org/hps/conditions/cli/AbstractCommand.java
=============================================================================
--- java/branches/jeremy-dev/conditions/src/main/java/org/hps/conditions/cli/AbstractCommand.java (original)
+++ java/branches/jeremy-dev/conditions/src/main/java/org/hps/conditions/cli/AbstractCommand.java Tue Nov 3 14:41:17 2015
@@ -1,11 +1,10 @@
package org.hps.conditions.cli;
import org.apache.commons.cli.CommandLine;
+import org.apache.commons.cli.DefaultParser;
import org.apache.commons.cli.HelpFormatter;
import org.apache.commons.cli.Options;
import org.apache.commons.cli.ParseException;
-import org.apache.commons.cli.Parser;
-import org.apache.commons.cli.PosixParser;
import org.hps.conditions.database.DatabaseConditionsManager;
/**
@@ -33,7 +32,7 @@
/**
* The parser for the options.
*/
- private final Parser parser = new PosixParser();
+ private final DefaultParser parser = new DefaultParser();
/**
* Class constructor.
Modified: java/branches/jeremy-dev/conditions/src/main/java/org/hps/conditions/cli/CommandLineTool.java
=============================================================================
--- java/branches/jeremy-dev/conditions/src/main/java/org/hps/conditions/cli/CommandLineTool.java (original)
+++ java/branches/jeremy-dev/conditions/src/main/java/org/hps/conditions/cli/CommandLineTool.java Tue Nov 3 14:41:17 2015
@@ -11,7 +11,7 @@
import org.apache.commons.cli.Option;
import org.apache.commons.cli.Options;
import org.apache.commons.cli.ParseException;
-import org.apache.commons.cli.PosixParser;
+import org.apache.commons.cli.DefaultParser;
import org.hps.conditions.database.DatabaseConditionsManager;
import org.lcsim.conditions.ConditionsManager.ConditionsNotFoundException;
@@ -80,7 +80,7 @@
/**
* The options parser.
*/
- private final PosixParser parser = new PosixParser();
+ private final DefaultParser parser = new DefaultParser();
/**
* Exit with the given status.
Modified: java/branches/jeremy-dev/conditions/src/main/java/org/hps/conditions/run/RunSpreadsheet.java
=============================================================================
--- java/branches/jeremy-dev/conditions/src/main/java/org/hps/conditions/run/RunSpreadsheet.java (original)
+++ java/branches/jeremy-dev/conditions/src/main/java/org/hps/conditions/run/RunSpreadsheet.java Tue Nov 3 14:41:17 2015
@@ -32,10 +32,38 @@
/**
* The column headers.
*/
- private static String[] HEADERS = {"run", "date", "start_time", "end_time", "to_tape", "n_events", "trigger_rate", "target", "beam_current",
- "beam_x", "beam_y", "trigger_config", "ecal_fadc_mode", "ecal_fadc_thresh", "ecal_fadc_window", "ecal_cluster_thresh_seed", "ecal_cluster_thresh_cluster",
- "ecal_cluster_window_hits", "ecal_cluster_window_pairs", "ecal_scalers_fadc", "ecal_scalers_dsc", "svt_y_position", "svt_offset_phase", "svt_offset_time",
- "ecal_temp", "ecal_lv_current", "notes"};
+ private static String[] HEADERS = {
+ "run",
+ "date",
+ "start_time",
+ "end_time",
+ "to_tape",
+ "n_events",
+ "files",
+ "trigger_rate",
+ "target",
+ "beam_current",
+ "beam_x",
+ "beam_y",
+ "trigger_config",
+ /*
+ "ecal_fadc_mode",
+ "ecal_fadc_thresh",
+ "ecal_fadc_window",
+ "ecal_cluster_thresh_seed",
+ "ecal_cluster_thresh_cluster",
+ "ecal_cluster_window_hits",
+ "ecal_cluster_window_pairs",
+ */
+ "ecal_scalers_fadc",
+ "ecal_scalers_dsc",
+ "svt_y_position",
+ "svt_offset_phase",
+ "svt_offset_time",
+ "ecal_temp",
+ "ecal_lv_current",
+ "notes"
+ };
/**
* Read the CSV file from the command line and print the data to the terminal (just a basic test).
Modified: java/branches/jeremy-dev/conditions/src/main/java/org/hps/conditions/svt/MotorPositionLoader.java
=============================================================================
--- java/branches/jeremy-dev/conditions/src/main/java/org/hps/conditions/svt/MotorPositionLoader.java (original)
+++ java/branches/jeremy-dev/conditions/src/main/java/org/hps/conditions/svt/MotorPositionLoader.java Tue Nov 3 14:41:17 2015
@@ -16,7 +16,7 @@
import org.apache.commons.cli.CommandLine;
import org.apache.commons.cli.HelpFormatter;
import org.apache.commons.cli.Options;
-import org.apache.commons.cli.PosixParser;
+import org.apache.commons.cli.DefaultParser;
/**
* Load SVT motor positions from a MYA dump, figure out time ranges (same position for > 10 seconds), and then convert
@@ -195,7 +195,7 @@
*/
void run(final String args[]) {
- final PosixParser parser = new PosixParser();
+ final DefaultParser parser = new DefaultParser();
CommandLine cl = null;
try {
Modified: java/branches/jeremy-dev/conditions/src/main/java/org/hps/conditions/svt/SvtBiasConditionsLoader.java
=============================================================================
--- java/branches/jeremy-dev/conditions/src/main/java/org/hps/conditions/svt/SvtBiasConditionsLoader.java (original)
+++ java/branches/jeremy-dev/conditions/src/main/java/org/hps/conditions/svt/SvtBiasConditionsLoader.java Tue Nov 3 14:41:17 2015
@@ -30,7 +30,7 @@
import org.apache.commons.cli.Option;
import org.apache.commons.cli.Options;
import org.apache.commons.cli.ParseException;
-import org.apache.commons.cli.PosixParser;
+import org.apache.commons.cli.DefaultParser;
import org.hps.conditions.api.ConditionsRecord;
import org.hps.conditions.database.DatabaseConditionsManager;
import org.hps.conditions.run.RunRange;
@@ -183,7 +183,7 @@
options.addOption(new Option("b", true, "beam current file"));
options.addOption(new Option("s", false, "Show plots"));
- final CommandLineParser parser = new PosixParser();
+ final CommandLineParser parser = new DefaultParser();
CommandLine cl = null;
try {
cl = parser.parse(options, args);
Modified: java/branches/jeremy-dev/conditions/src/main/java/org/hps/conditions/svt/SvtConditionsLoader.java
=============================================================================
--- java/branches/jeremy-dev/conditions/src/main/java/org/hps/conditions/svt/SvtConditionsLoader.java (original)
+++ java/branches/jeremy-dev/conditions/src/main/java/org/hps/conditions/svt/SvtConditionsLoader.java Tue Nov 3 14:41:17 2015
@@ -8,7 +8,7 @@
import org.apache.commons.cli.Option;
import org.apache.commons.cli.Options;
import org.apache.commons.cli.ParseException;
-import org.apache.commons.cli.PosixParser;
+import org.apache.commons.cli.DefaultParser;
import org.hps.conditions.api.ConditionsRecord;
import org.hps.conditions.api.TableMetaData;
import org.hps.conditions.database.DatabaseConditionsManager;
@@ -60,7 +60,7 @@
final Options options = setupCommandLineOptions();
// Parse the command line arguments
- final CommandLineParser parser = new PosixParser();
+ final CommandLineParser parser = new DefaultParser();
final CommandLine commandLine;
try {
commandLine = parser.parse(options, args);
Modified: java/branches/jeremy-dev/crawler/pom.xml
=============================================================================
--- java/branches/jeremy-dev/crawler/pom.xml (original)
+++ java/branches/jeremy-dev/crawler/pom.xml Tue Nov 3 14:41:17 2015
@@ -19,10 +19,5 @@
<groupId>org.hps</groupId>
<artifactId>hps-run-database</artifactId>
</dependency>
- <dependency>
- <groupId>org.freehep</groupId>
- <artifactId>freehep-rootio</artifactId>
- <version>2.2.1</version>
- </dependency>
</dependencies>
</project>
Modified: java/branches/jeremy-dev/crawler/src/main/java/org/hps/crawler/DatacatCrawler.java
=============================================================================
--- java/branches/jeremy-dev/crawler/src/main/java/org/hps/crawler/DatacatCrawler.java (original)
+++ java/branches/jeremy-dev/crawler/src/main/java/org/hps/crawler/DatacatCrawler.java Tue Nov 3 14:41:17 2015
@@ -24,7 +24,7 @@
import org.apache.commons.cli.HelpFormatter;
import org.apache.commons.cli.Options;
import org.apache.commons.cli.ParseException;
-import org.apache.commons.cli.PosixParser;
+import org.apache.commons.cli.DefaultParser;
import org.hps.datacat.client.DatacatClient;
import org.hps.datacat.client.DatacatClientFactory;
import org.hps.datacat.client.DatasetFileFormat;
@@ -165,7 +165,7 @@
/**
* The options parser.
*/
- private final PosixParser parser = new PosixParser();
+ private final DefaultParser parser = new DefaultParser();
/**
* Throw an exception if the path doesn't exist in the data catalog or it is not a folder.
Modified: java/branches/jeremy-dev/evio/src/main/java/org/hps/evio/BasicEvioFileReader.java
=============================================================================
--- java/branches/jeremy-dev/evio/src/main/java/org/hps/evio/BasicEvioFileReader.java (original)
+++ java/branches/jeremy-dev/evio/src/main/java/org/hps/evio/BasicEvioFileReader.java Tue Nov 3 14:41:17 2015
@@ -8,7 +8,7 @@
import org.apache.commons.cli.Option;
import org.apache.commons.cli.Options;
import org.apache.commons.cli.ParseException;
-import org.apache.commons.cli.PosixParser;
+import org.apache.commons.cli.DefaultParser;
import org.hps.record.evio.EvioEventUtilities;
import org.hps.record.triggerbank.AbstractIntData.IntBankDefinition;
import org.hps.record.triggerbank.HeadBankData;
@@ -33,7 +33,7 @@
if (args.length == 0) {
printUsage(options);
}
- final CommandLineParser parser = new PosixParser();
+ final CommandLineParser parser = new DefaultParser();
CommandLine cl = null;
try {
cl = parser.parse(options, args);
Modified: java/branches/jeremy-dev/evio/src/main/java/org/hps/evio/EvioToLcio.java
=============================================================================
--- java/branches/jeremy-dev/evio/src/main/java/org/hps/evio/EvioToLcio.java (original)
+++ java/branches/jeremy-dev/evio/src/main/java/org/hps/evio/EvioToLcio.java Tue Nov 3 14:41:17 2015
@@ -21,7 +21,7 @@
import org.apache.commons.cli.Option;
import org.apache.commons.cli.Options;
import org.apache.commons.cli.ParseException;
-import org.apache.commons.cli.PosixParser;
+import org.apache.commons.cli.DefaultParser;
import org.freehep.record.source.NoSuchRecordException;
import org.hps.conditions.database.DatabaseConditionsManager;
import org.hps.job.JobManager;
@@ -255,7 +255,7 @@
if (args.length == 0) {
this.printUsage();
}
- final CommandLineParser parser = new PosixParser();
+ final CommandLineParser parser = new DefaultParser();
CommandLine cl = null;
try {
cl = parser.parse(OPTIONS, args);
Modified: java/branches/jeremy-dev/logging/src/main/resources/org/hps/logging/config/logging.properties
=============================================================================
--- java/branches/jeremy-dev/logging/src/main/resources/org/hps/logging/config/logging.properties (original)
+++ java/branches/jeremy-dev/logging/src/main/resources/org/hps/logging/config/logging.properties Tue Nov 3 14:41:17 2015
@@ -11,19 +11,20 @@
handlers = java.util.logging.ConsoleHandler
# prints timestamp (1$), level (4$), source ($2), message (5$), and (optionally) an exception (6$).
-java.util.logging.SimpleFormatter.format = %1$tc [%4$s] %2$s :: %5$s%6$s%n
+java.util.logging.SimpleFormatter.format = %1$tY-%1$tm-%1$td %1$tT [%4$s] %2$s :: %5$s%6$s%n
# configure the console handler
java.util.logging.ConsoleHandler.level = ALL
java.util.logging.ConsoleHandler.formatter = java.util.logging.SimpleFormatter
# lcsim job
-org.lcsim.job.level = ALL
+org.lcsim.job.level = CONFIG
org.lcsim.job.EventMarkerDriver.level = ALL
+org.lcsim.job.EventPrintLoopAdapter = ALL
# conditions
org.hps.conditions.api.level = WARNING
-org.hps.conditions.database.level = WARNING
+org.hps.conditions.database.level = ALL
org.hps.conditions.cli.level = CONFIG
org.hps.conditions.ecal.level = WARNING
org.hps.conditions.svt.level = WARNING
@@ -42,9 +43,13 @@
# crawler
org.hps.crawler.level = CONFIG
+# datacat
+org.hps.datacat.client.level = ALL
+
# ecal-recon
org.hps.recon.ecal.level = CONFIG
org.hps.recon.ecal.cluster.level = WARNING
+org.hps.recon.ecal.cluster.ClusterDriver.level = WARNING
# recon
org.hps.recon.filtering.level = WARNING
@@ -71,3 +76,6 @@
org.lcsim.detector.converter.compact.level = INFO
org.lcsim.geometry.compact.converter.level = INFO
org.hps.detector.svt.level = ALL
+
+# test data
+org.hps.data.test = INFO
Modified: java/branches/jeremy-dev/logging/src/main/resources/org/hps/logging/config/test_logging.properties
=============================================================================
--- java/branches/jeremy-dev/logging/src/main/resources/org/hps/logging/config/test_logging.properties (original)
+++ java/branches/jeremy-dev/logging/src/main/resources/org/hps/logging/config/test_logging.properties Tue Nov 3 14:41:17 2015
@@ -11,7 +11,7 @@
handlers = java.util.logging.ConsoleHandler
# prints timestamp (1$), level (4$), source ($2), message (5$), and (optionally) an exception (6$).
-java.util.logging.SimpleFormatter.format = %1$tc [%4$s] %2$s :: %5$s%6$s%n
+java.util.logging.SimpleFormatter.format = %1$tY-%1$tm-%1$td %1$tT [%4$s] %2$s :: %5$s%6$s%n
# configure the console handler
java.util.logging.ConsoleHandler.level = ALL
@@ -20,10 +20,11 @@
# lcsim job
org.lcsim.job.level = WARNING
org.lcsim.job.EventMarkerDriver.level = OFF
+org.lcsim.job.EventPrintLoopAdapter = ALL
# conditions
org.hps.conditions.api.level = WARNING
-org.hps.conditions.database.level = WARNING
+org.hps.conditions.database.level = ALL
org.hps.conditions.cli.level = WARNING
org.hps.conditions.ecal.level = WARNING
org.hps.conditions.svt.level = WARNING
@@ -42,9 +43,13 @@
# crawler
org.hps.crawler.level = WARNING
+# datacat
+org.hps.datacat.client.level = ALL
+
# ecal-recon
org.hps.recon.ecal.level = WARNING
org.hps.recon.ecal.cluster.level = WARNING
+org.hps.recon.ecal.cluster.ClusterDriver.level = WARNING
# recon
org.hps.recon.filtering.level = WARNING
@@ -71,3 +76,6 @@
org.lcsim.detector.converter.compact.level = WARNING
org.lcsim.geometry.compact.converter.level = WARNING
org.hps.detector.svt.level = WARNING
+
+# test data
+org.hps.data.test = INFO
Modified: java/branches/jeremy-dev/monitoring-app/src/main/java/org/hps/monitoring/application/Main.java
=============================================================================
--- java/branches/jeremy-dev/monitoring-app/src/main/java/org/hps/monitoring/application/Main.java (original)
+++ java/branches/jeremy-dev/monitoring-app/src/main/java/org/hps/monitoring/application/Main.java Tue Nov 3 14:41:17 2015
@@ -8,7 +8,7 @@
import org.apache.commons.cli.Option;
import org.apache.commons.cli.Options;
import org.apache.commons.cli.ParseException;
-import org.apache.commons.cli.PosixParser;
+import org.apache.commons.cli.DefaultParser;
import org.hps.monitoring.application.model.Configuration;
/**
@@ -29,7 +29,7 @@
final Options options = new Options();
options.addOption(new Option("h", false, "Print help."));
options.addOption(new Option("c", true, "Load a properties file with configuration parameters."));
- final CommandLineParser parser = new PosixParser();
+ final CommandLineParser parser = new DefaultParser();
// Parse command line arguments.
final CommandLine cl;
Modified: java/branches/jeremy-dev/parent/pom.xml
=============================================================================
--- java/branches/jeremy-dev/parent/pom.xml (original)
+++ java/branches/jeremy-dev/parent/pom.xml Tue Nov 3 14:41:17 2015
@@ -278,8 +278,7 @@
<dependency>
<groupId>jfreechart-aida-experimental</groupId>
<artifactId>jfreechart-aida-experimental</artifactId>
- <version>1.7</version>
-<!-- <version>1.8-SNAPSHOT</version> -->
+ <version>1.8-SNAPSHOT</version>
<exclusions>
<exclusion>
<groupId>jdom</groupId>
@@ -338,10 +337,6 @@
<version>2.17</version>
</plugin>
<plugin>
- <artifactId>maven-resources-plugin</artifactId>
- <version>2.7</version>
- </plugin>
- <plugin>
<groupId>org.kuali.maven.plugins</groupId>
<artifactId>graph-maven-plugin</artifactId>
</plugin>
@@ -353,9 +348,6 @@
<extension>
<groupId>org.apache.maven.wagon</groupId>
<artifactId>wagon-webdav-jackrabbit</artifactId>
- <!--
- <version>2.3</version>
- -->
<version>2.8</version>
</extension>
</extensions>
@@ -425,12 +417,16 @@
</plugin>
<plugin>
<artifactId>maven-compiler-plugin</artifactId>
- <version>3.2</version>
+ <version>3.3</version>
<configuration>
<source>1.7</source>
<target>1.7</target>
<showWarnings>true</showWarnings>
<showDeprecation>true</showDeprecation>
+ <!--
+ <staleMillis>1</staleMillis>
+ <useIncrementalCompilation>false</useIncrementalCompilation>
+ -->
</configuration>
</plugin>
<plugin>
@@ -477,6 +473,10 @@
<artifactId>maven-shade-plugin</artifactId>
<version>2.3</version>
</plugin>
+ <plugin>
+ <artifactId>maven-resources-plugin</artifactId>
+ <version>2.7</version>
+ </plugin>
</plugins>
</build>
<developers>
Modified: java/branches/jeremy-dev/record-util/src/main/java/org/hps/record/evio/EvioEventSkimmer.java
=============================================================================
--- java/branches/jeremy-dev/record-util/src/main/java/org/hps/record/evio/EvioEventSkimmer.java (original)
+++ java/branches/jeremy-dev/record-util/src/main/java/org/hps/record/evio/EvioEventSkimmer.java Tue Nov 3 14:41:17 2015
@@ -14,7 +14,7 @@
import org.apache.commons.cli.CommandLine;
import org.apache.commons.cli.Options;
import org.apache.commons.cli.ParseException;
-import org.apache.commons.cli.PosixParser;
+import org.apache.commons.cli.DefaultParser;
import org.jlab.coda.jevio.EventWriter;
import org.jlab.coda.jevio.EvioEvent;
import org.jlab.coda.jevio.EvioReader;
@@ -51,7 +51,7 @@
*/
public static void main(String[] args) {
- PosixParser parser = new PosixParser();
+ DefaultParser parser = new DefaultParser();
CommandLine commandLine = null;
try {
Modified: java/branches/jeremy-dev/record-util/src/main/java/org/hps/record/evio/EvioFileProducer.java
=============================================================================
--- java/branches/jeremy-dev/record-util/src/main/java/org/hps/record/evio/EvioFileProducer.java (original)
+++ java/branches/jeremy-dev/record-util/src/main/java/org/hps/record/evio/EvioFileProducer.java Tue Nov 3 14:41:17 2015
@@ -16,7 +16,7 @@
import org.apache.commons.cli.CommandLine;
import org.apache.commons.cli.HelpFormatter;
import org.apache.commons.cli.Options;
-import org.apache.commons.cli.PosixParser;
+import org.apache.commons.cli.DefaultParser;
import org.jlab.coda.et.EtAttachment;
import org.jlab.coda.et.EtConstants;
import org.jlab.coda.et.EtEvent;
@@ -195,7 +195,7 @@
public void run(final String[] args) {
// Command line parser.
- final PosixParser parser = new PosixParser();
+ final DefaultParser parser = new DefaultParser();
try {
Modified: java/branches/jeremy-dev/run-database/src/main/java/org/hps/run/database/RunDatabaseCommandLine.java
=============================================================================
--- java/branches/jeremy-dev/run-database/src/main/java/org/hps/run/database/RunDatabaseCommandLine.java (original)
+++ java/branches/jeremy-dev/run-database/src/main/java/org/hps/run/database/RunDatabaseCommandLine.java Tue Nov 3 14:41:17 2015
@@ -15,7 +15,7 @@
import org.apache.commons.cli.HelpFormatter;
import org.apache.commons.cli.Options;
import org.apache.commons.cli.ParseException;
-import org.apache.commons.cli.PosixParser;
+import org.apache.commons.cli.DefaultParser;
import org.hps.conditions.database.ConnectionParameters;
import org.hps.datacat.client.DatacatClient;
import org.hps.datacat.client.DatacatClientFactory;
@@ -187,7 +187,7 @@
*/
RunDatabaseCommandLine parse(final String args[]) {
try {
- final CommandLine cl = new PosixParser().parse(OPTIONS, args);
+ final CommandLine cl = new DefaultParser().parse(OPTIONS, args);
// Print help and exit.
if (cl.hasOption("h") || args.length == 0) {
Modified: java/branches/jeremy-dev/tracking/src/main/java/org/hps/recon/tracking/gbl/GBLRefitterDriver.java
=============================================================================
--- java/branches/jeremy-dev/tracking/src/main/java/org/hps/recon/tracking/gbl/GBLRefitterDriver.java (original)
+++ java/branches/jeremy-dev/tracking/src/main/java/org/hps/recon/tracking/gbl/GBLRefitterDriver.java Tue Nov 3 14:41:17 2015
@@ -10,11 +10,9 @@
import org.hps.recon.tracking.MultipleScattering;
import org.hps.recon.tracking.TrackUtils;
import org.lcsim.event.EventHeader;
-import org.lcsim.event.RawTrackerHit;
import org.lcsim.event.RelationalTable;
import org.lcsim.event.Track;
import org.lcsim.event.TrackerHit;
-import org.lcsim.fit.helicaltrack.HelicalTrackFit;
import org.lcsim.geometry.Detector;
import org.lcsim.lcio.LCIOConstants;
import org.lcsim.util.Driver;
@@ -30,6 +28,7 @@
private double bfield;
private final MultipleScattering _scattering = new MultipleScattering(new MaterialSupervisor());
+ private boolean mergeTracks = false;
public void setInputCollectionName(String inputCollectionName) {
this.inputCollectionName = inputCollectionName;
@@ -37,6 +36,16 @@
public void setOutputCollectionName(String outputCollectionName) {
this.outputCollectionName = outputCollectionName;
+ }
+
+ /**
+ * Merge tracks with overlapping hit content. Right now nothing actually
+ * happens to the merged tracks; this is just for testing.
+ *
+ * @param mergeTracks default to false
+ */
+ public void setMergeTracks(boolean mergeTracks) {
+ this.mergeTracks = mergeTracks;
}
@Override
@@ -59,46 +68,63 @@
Map<Track, Track> inputToRefitted = new HashMap<Track, Track>();
for (Track track : tracks) {
- HelicalTrackFit helix = TrackUtils.getHTF(track);
- FittedGblTrajectory fit = GblUtils.doGBLFit(helix, TrackUtils.getStripHits(track, hitToStrips, hitToRotated), _scattering, bfield, 0);
-
- Track newTrack = MakeGblTracks.makeCorrectedTrack(fit, helix, track.getTrackerHits(), track.getType(), bfield);
+ Track newTrack = GblUtils.refitTrack(TrackUtils.getHTF(track), TrackUtils.getStripHits(track, hitToStrips, hitToRotated), track.getTrackerHits(), 5, _scattering, bfield);
refittedTracks.add(newTrack);
inputToRefitted.put(track, newTrack);
}
- Map<Set<TrackerHit>, List<Track>> hitSetToTrackList = new HashMap<Set<TrackerHit>, List<Track>>();
+ if (mergeTracks) {
+ List<Track> mergedTracks = new ArrayList<Track>();
- for (Track track : tracks) {
- Set<TrackerHit> trackHth = new HashSet<TrackerHit>(track.getTrackerHits());
- for (Track otherTrack : tracks) {
- Set<TrackerHit> allHth = new HashSet<TrackerHit>(otherTrack.getTrackerHits());
- allHth.addAll(trackHth);
- List<TrackerHit> hthList = new ArrayList<TrackerHit>(allHth);
- if (hthList.size() == trackHth.size()) {
- continue;
+ for (Track track : refittedTracks) {
+ List<TrackerHit> trackHth = track.getTrackerHits();
+ otherTrackLoop:
+ for (Track otherTrack : refittedTracks) {
+ if (track == otherTrack) {
+ continue;
+ }
+
+ Set<TrackerHit> allHth = new HashSet<TrackerHit>(otherTrack.getTrackerHits());
+ allHth.addAll(trackHth);
+// if (allHth.size() == trackHth.size()) {
+// continue;
+// }
+
+ boolean[] hasHit = new boolean[6];
+
+ for (TrackerHit hit : allHth) {
+ int layer = (TrackUtils.getLayer(hit) - 1) / 2;
+ if (hasHit[layer]) {
+ continue otherTrackLoop;
+ }
+ hasHit[layer] = true;
+ }
+ for (Track mergedTrack : mergedTracks) {
+ if (mergedTrack.getTrackerHits().containsAll(allHth)) {
+ continue otherTrackLoop;
+ }
+ }
+
+ Track mergedTrack = GblUtils.refitTrack(TrackUtils.getHTF(track), TrackUtils.getStripHits(track, hitToStrips, hitToRotated), allHth, 5, _scattering, bfield);
+ mergedTracks.add(mergedTrack);
+// System.out.format("%f %f %f\n", fit.get_chi2(), inputToRefitted.get(track).getChi2(), inputToRefitted.get(otherTrack).getChi2());
+// mergedTrackToTrackList.put(mergedTrack, new ArrayList<Track>());
}
+ }
- boolean[] hasHit = new boolean[6];
- boolean isGood = true;
-
- for (TrackerHit hit : hthList) {
- int layer = (TrackUtils.getLayer(hit) - 1) / 2;
- if (hasHit[layer]) {
- isGood = false;
- break;
+ for (Track mergedTrack : mergedTracks) {
+ List<Track> subTracks = new ArrayList<Track>();
+ Set<TrackerHit> trackHth = new HashSet<TrackerHit>(mergedTrack.getTrackerHits());
+ for (Track track : refittedTracks) {
+ if (trackHth.containsAll(track.getTrackerHits())) {
+ subTracks.add(track);
}
- hasHit[layer] = true;
}
- if (isGood) {
- HelicalTrackFit helix = TrackUtils.getHTF(track);
- Set<TrackerHit> allStripHits = new HashSet<TrackerHit>(TrackUtils.getStripHits(track, hitToStrips, hitToRotated));
- allStripHits.addAll(TrackUtils.getStripHits(otherTrack, hitToStrips, hitToRotated));
-
- FittedGblTrajectory fit = GblUtils.doGBLFit(helix, new ArrayList<TrackerHit>(allStripHits), _scattering, bfield, 0);
- Track newTrack = MakeGblTracks.makeCorrectedTrack(fit, helix, new ArrayList<TrackerHit>(allHth), 0, bfield);
- System.out.format("%f %f %f\n", fit.get_chi2(), inputToRefitted.get(track).getChi2(), inputToRefitted.get(otherTrack).getChi2());
+ System.out.format("%f:\t", mergedTrack.getChi2());
+ for (Track subTrack : subTracks) {
+ System.out.format("%f (%d)\t", subTrack.getChi2(), subTrack.getTrackerHits().size());
}
+ System.out.println();
}
}
// Put the tracks back into the event and exit
Modified: java/branches/jeremy-dev/tracking/src/main/java/org/hps/recon/tracking/gbl/GblUtils.java
=============================================================================
--- java/branches/jeremy-dev/tracking/src/main/java/org/hps/recon/tracking/gbl/GblUtils.java (original)
+++ java/branches/jeremy-dev/tracking/src/main/java/org/hps/recon/tracking/gbl/GblUtils.java Tue Nov 3 14:41:17 2015
@@ -6,6 +6,9 @@
import hep.physics.vec.Hep3Vector;
import hep.physics.vec.VecOp;
import java.util.ArrayList;
+import java.util.Collection;
+import java.util.Collections;
+import java.util.Comparator;
import java.util.List;
import org.hps.recon.tracking.CoordinateTransformations;
import org.hps.recon.tracking.MaterialSupervisor;
@@ -19,6 +22,7 @@
import org.lcsim.detector.tracker.silicon.SiSensor;
import org.lcsim.detector.tracker.silicon.SiSensorElectrodes;
import org.lcsim.event.RawTrackerHit;
+import org.lcsim.event.Track;
import org.lcsim.event.TrackerHit;
import org.lcsim.fit.helicaltrack.HelicalTrackFit;
import org.lcsim.fit.helicaltrack.HelicalTrackStrip;
@@ -125,6 +129,34 @@
}
}
+ /**
+ * Do a GBL fit to an arbitrary set of strip hits, with a starting value of
+ * the helix parameters.
+ *
+ * @param helix Initial helix parameters. Only track parameters are used
+ * (not covariance)
+ * @param stripHits Strip hits to be used for the GBL fit. Does not need to
+ * be in sorted order.
+ * @param hth Stereo hits for the track's hit list (these are not used in
+ * the GBL fit). Does not need to be in sorted order.
+ * @param nIterations Number of times to iterate the GBL fit.
+ * @param scattering Multiple scattering manager.
+ * @param bfield B-field
+ * @return The refitted track.
+ */
+ public static Track refitTrack(HelicalTrackFit helix, Collection<TrackerHit> stripHits, Collection<TrackerHit> hth, int nIterations, MultipleScattering scattering, double bfield) {
+ List<TrackerHit> allHthList = sortHits(hth);
+ List<TrackerHit> sortedStripHits = sortHits(stripHits);
+ FittedGblTrajectory fit = GblUtils.doGBLFit(helix, sortedStripHits, scattering, bfield, 0);
+ for (int i = 0; i < nIterations; i++) {
+ Track newTrack = MakeGblTracks.makeCorrectedTrack(fit, helix, allHthList, 0, bfield);
+ helix = TrackUtils.getHTF(newTrack);
+ fit = GblUtils.doGBLFit(helix, sortedStripHits, scattering, bfield, 0);
+ }
+ Track mergedTrack = MakeGblTracks.makeCorrectedTrack(fit, helix, allHthList, 0, bfield);
+ return mergedTrack;
+ }
+
public static FittedGblTrajectory doGBLFit(HelicalTrackFit htf, List<TrackerHit> stripHits, MultipleScattering _scattering, double bfield, int debug) {
List<GBLStripClusterData> stripData = makeStripData(htf, stripHits, _scattering, bfield, debug);
double bfac = Constants.fieldConversion * bfield;
@@ -294,4 +326,18 @@
return strip;
}
+
+ private static List<TrackerHit> sortHits(Collection<TrackerHit> hits) {
+ List<TrackerHit> hitList = new ArrayList<TrackerHit>(hits);
+ Collections.sort(hitList, new LayerComparator());
+ return hitList;
+ }
+
+ private static class LayerComparator implements Comparator<TrackerHit> {
+
+ @Override
+ public int compare(TrackerHit o1, TrackerHit o2) {
+ return Integer.compare(TrackUtils.getLayer(o1), TrackUtils.getLayer(o2));
+ }
+ }
}
Modified: java/branches/jeremy-dev/tracking/src/main/java/org/hps/svt/alignment/BuildCompact.java
=============================================================================
--- java/branches/jeremy-dev/tracking/src/main/java/org/hps/svt/alignment/BuildCompact.java (original)
+++ java/branches/jeremy-dev/tracking/src/main/java/org/hps/svt/alignment/BuildCompact.java Tue Nov 3 14:41:17 2015
@@ -23,7 +23,7 @@
import org.apache.commons.cli.Option;
import org.apache.commons.cli.Options;
import org.apache.commons.cli.ParseException;
-import org.apache.commons.cli.PosixParser;
+import org.apache.commons.cli.DefaultParser;
import org.jdom.Document;
import org.jdom.Element;
@@ -156,7 +156,7 @@
printHelpAndExit(options);
}
- CommandLineParser parser = new PosixParser();
+ CommandLineParser parser = new DefaultParser();
CommandLine cl = null;
try {
cl = parser.parse(options, args);
Modified: java/branches/jeremy-dev/tracking/src/main/java/org/hps/svt/alignment/BuildMillepedeCompact.java
=============================================================================
--- java/branches/jeremy-dev/tracking/src/main/java/org/hps/svt/alignment/BuildMillepedeCompact.java (original)
+++ java/branches/jeremy-dev/tracking/src/main/java/org/hps/svt/alignment/BuildMillepedeCompact.java Tue Nov 3 14:41:17 2015
@@ -29,7 +29,7 @@
import org.apache.commons.cli.Option;
import org.apache.commons.cli.Options;
import org.apache.commons.cli.ParseException;
-import org.apache.commons.cli.PosixParser;
+import org.apache.commons.cli.DefaultParser;
import org.hps.recon.tracking.CoordinateTransformations;
import org.jdom.Attribute;
import org.jdom.DataConversionException;
@@ -83,7 +83,7 @@
printHelpAndExit(options);
}
- CommandLineParser parser = new PosixParser();
+ CommandLineParser parser = new DefaultParser();
CommandLine cl = null;
try {
cl = parser.parse(options, args);
Modified: java/branches/jeremy-dev/users/src/main/java/org/hps/users/jeremym/EvioFileScanner.java
=============================================================================
--- java/branches/jeremy-dev/users/src/main/java/org/hps/users/jeremym/EvioFileScanner.java (original)
+++ java/branches/jeremy-dev/users/src/main/java/org/hps/users/jeremym/EvioFileScanner.java Tue Nov 3 14:41:17 2015
@@ -28,7 +28,7 @@
import org.apache.commons.cli.CommandLine;
import org.apache.commons.cli.Options;
import org.apache.commons.cli.ParseException;
-import org.apache.commons.cli.PosixParser;
+import org.apache.commons.cli.DefaultParser;
import org.hps.conditions.database.ConnectionParameters;
import org.hps.record.evio.EvioEventConstants;
import org.hps.record.evio.EvioEventUtilities;
@@ -484,7 +484,7 @@
final Set<Integer> acceptRuns = new HashSet<Integer>();
- final PosixParser parser = new PosixParser();
+ final DefaultParser parser = new DefaultParser();
boolean printSummary = false;
Modified: java/branches/jeremy-dev/users/src/main/java/org/hps/users/meeg/FilterMCBunches.java
=============================================================================
--- java/branches/jeremy-dev/users/src/main/java/org/hps/users/meeg/FilterMCBunches.java (original)
+++ java/branches/jeremy-dev/users/src/main/java/org/hps/users/meeg/FilterMCBunches.java Tue Nov 3 14:41:17 2015
@@ -17,7 +17,7 @@
import org.apache.commons.cli.Option;
import org.apache.commons.cli.Options;
import org.apache.commons.cli.ParseException;
-import org.apache.commons.cli.PosixParser;
+import org.apache.commons.cli.DefaultParser;
import org.lcsim.event.EventHeader;
import org.lcsim.event.MCParticle;
import org.lcsim.event.RawCalorimeterHit;
@@ -70,7 +70,7 @@
public static void main(String[] args) {
// Set up command line parsing.
Options options = createCommandLineOptions();
- CommandLineParser parser = new PosixParser();
+ CommandLineParser parser = new DefaultParser();
// Parse command line arguments.
CommandLine cl = null;
Modified: java/branches/jeremy-dev/users/src/main/java/org/hps/users/meeg/MergeMCBunches.java
=============================================================================
--- java/branches/jeremy-dev/users/src/main/java/org/hps/users/meeg/MergeMCBunches.java (original)
+++ java/branches/jeremy-dev/users/src/main/java/org/hps/users/meeg/MergeMCBunches.java Tue Nov 3 14:41:17 2015
@@ -13,7 +13,7 @@
import org.apache.commons.cli.Option;
import org.apache.commons.cli.Options;
import org.apache.commons.cli.ParseException;
-import org.apache.commons.cli.PosixParser;
+import org.apache.commons.cli.DefaultParser;
import org.lcsim.event.EventHeader;
import org.lcsim.event.MCParticle;
import org.lcsim.event.SimCalorimeterHit;
@@ -49,7 +49,7 @@
public static void main(String[] args) {
// Set up command line parsing.
Options options = createCommandLineOptions();
- CommandLineParser parser = new PosixParser();
+ CommandLineParser parser = new DefaultParser();
// Parse command line arguments.
CommandLine cl = null;
Modified: java/branches/jeremy-dev/users/src/main/java/org/hps/users/meeg/SvtChargeIntegrator.java
=============================================================================
--- java/branches/jeremy-dev/users/src/main/java/org/hps/users/meeg/SvtChargeIntegrator.java (original)
+++ java/branches/jeremy-dev/users/src/main/java/org/hps/users/meeg/SvtChargeIntegrator.java Tue Nov 3 14:41:17 2015
@@ -15,7 +15,7 @@
import org.apache.commons.cli.HelpFormatter;
import org.apache.commons.cli.Options;
import org.apache.commons.cli.ParseException;
-import org.apache.commons.cli.PosixParser;
+import org.apache.commons.cli.DefaultParser;
import org.apache.commons.csv.CSVFormat;
import org.apache.commons.csv.CSVParser;
import org.apache.commons.csv.CSVRecord;
@@ -64,7 +64,7 @@
// options.addOption(new Option("b", true, "beam current file"));
// options.addOption(new Option("s", false, "Show plots"));
- final CommandLineParser parser = new PosixParser();
+ final CommandLineParser parser = new DefaultParser();
CommandLine cl = null;
try {
cl = parser.parse(options, args);
Modified: java/branches/jeremy-dev/users/src/main/java/org/hps/users/omoreno/LheToStdhep.java
=============================================================================
--- java/branches/jeremy-dev/users/src/main/java/org/hps/users/omoreno/LheToStdhep.java (original)
+++ java/branches/jeremy-dev/users/src/main/java/org/hps/users/omoreno/LheToStdhep.java Tue Nov 3 14:41:17 2015
@@ -15,7 +15,7 @@
import org.apache.commons.cli.CommandLineParser;
import org.apache.commons.cli.Options;
import org.apache.commons.cli.ParseException;
-import org.apache.commons.cli.PosixParser;
+import org.apache.commons.cli.DefaultParser;
import org.jdom.Document;
import org.jdom.Element;
import org.jdom.JDOMException;
@@ -58,7 +58,7 @@
String stdhepFileName = "output.stdhep";
// Instantiate te command line parser
- CommandLineParser parser = new PosixParser();
+ CommandLineParser parser = new DefaultParser();
// Create the Options
// TODO: Add ability to parse list of files.
Modified: java/branches/jeremy-dev/users/src/main/java/org/hps/users/phansson/DumpAIDATextFiles.java
=============================================================================
--- java/branches/jeremy-dev/users/src/main/java/org/hps/users/phansson/DumpAIDATextFiles.java (original)
+++ java/branches/jeremy-dev/users/src/main/java/org/hps/users/phansson/DumpAIDATextFiles.java Tue Nov 3 14:41:17 2015
@@ -21,7 +21,7 @@
import org.apache.commons.cli.Option;
import org.apache.commons.cli.Options;
import org.apache.commons.cli.ParseException;
-import org.apache.commons.cli.PosixParser;
+import org.apache.commons.cli.DefaultParser;
/**
*
@@ -116,7 +116,7 @@
help.printHelp(" ", options);
System.exit(1);
}
- CommandLineParser parser = new PosixParser();
+ CommandLineParser parser = new DefaultParser();
CommandLine cl = null;
try {
cl = parser.parse(options, args);
Modified: java/branches/jeremy-dev/users/src/main/java/org/hps/users/phansson/dataMCPlots.java
=============================================================================
--- java/branches/jeremy-dev/users/src/main/java/org/hps/users/phansson/dataMCPlots.java (original)
+++ java/branches/jeremy-dev/users/src/main/java/org/hps/users/phansson/dataMCPlots.java Tue Nov 3 14:41:17 2015
@@ -25,7 +25,7 @@
import org.apache.commons.cli.HelpFormatter;
import org.apache.commons.cli.Options;
import org.apache.commons.cli.ParseException;
-import org.apache.commons.cli.PosixParser;
+import org.apache.commons.cli.DefaultParser;
import org.lcsim.util.aida.AIDA;
/**
@@ -93,7 +93,7 @@
help.printHelp(" ", opts);
System.exit(1);
}
- CommandLineParser parser = new PosixParser();
+ CommandLineParser parser = new DefaultParser();
CommandLine cmd=null;
try {
cmd = parser.parse(opts, args);
Modified: java/branches/jeremy-dev/users/src/main/java/org/hps/users/phansson/ecalPlots.java
=============================================================================
--- java/branches/jeremy-dev/users/src/main/java/org/hps/users/phansson/ecalPlots.java (original)
+++ java/branches/jeremy-dev/users/src/main/java/org/hps/users/phansson/ecalPlots.java Tue Nov 3 14:41:17 2015
@@ -19,7 +19,7 @@
import org.apache.commons.cli.HelpFormatter;
import org.apache.commons.cli.Options;
import org.apache.commons.cli.ParseException;
-import org.apache.commons.cli.PosixParser;
+import org.apache.commons.cli.DefaultParser;
/**
*
@@ -72,7 +72,7 @@
help.printHelp(" ", opts);
System.exit(1);
}
- CommandLineParser parser = new PosixParser();
+ CommandLineParser parser = new DefaultParser();
CommandLine cmd=null;
try {
cmd = parser.parse(opts, args);
Modified: java/branches/jeremy-dev/users/src/main/java/org/hps/users/phansson/mergeSimpleAIDA.java
=============================================================================
--- java/branches/jeremy-dev/users/src/main/java/org/hps/users/phansson/mergeSimpleAIDA.java (original)
+++ java/branches/jeremy-dev/users/src/main/java/org/hps/users/phansson/mergeSimpleAIDA.java Tue Nov 3 14:41:17 2015
@@ -20,7 +20,7 @@
import org.apache.commons.cli.HelpFormatter;
import org.apache.commons.cli.Options;
import org.apache.commons.cli.ParseException;
-import org.apache.commons.cli.PosixParser;
+import org.apache.commons.cli.DefaultParser;
import org.lcsim.util.aida.AIDA;
/**
@@ -52,7 +52,7 @@
help.printHelp(" ", opts);
System.exit(1);
}
- CommandLineParser parser = new PosixParser();
+ CommandLineParser parser = new DefaultParser();
CommandLine cmd = null;
try {
cmd = parser.parse(opts, args);
Modified: java/branches/jeremy-dev/users/src/main/java/org/hps/users/phansson/trigRate.java
=============================================================================
--- java/branches/jeremy-dev/users/src/main/java/org/hps/users/phansson/trigRate.java (original)
+++ java/branches/jeremy-dev/users/src/main/java/org/hps/users/phansson/trigRate.java Tue Nov 3 14:41:17 2015
@@ -17,7 +17,7 @@
import org.apache.commons.cli.Option;
import org.apache.commons.cli.Options;
import org.apache.commons.cli.ParseException;
-import org.apache.commons.cli.PosixParser;
+import org.apache.commons.cli.DefaultParser;
/**
*
@@ -73,7 +73,7 @@
help.printHelp(" ", options);
System.exit(1);
}
- CommandLineParser parser = new PosixParser();
+ CommandLineParser parser = new DefaultParser();
CommandLine cl = null;
try {
Modified: java/branches/jeremy-dev/util/src/main/java/org/hps/util/CalculateAcceptanceFromMadGraph.java
=============================================================================
--- java/branches/jeremy-dev/util/src/main/java/org/hps/util/CalculateAcceptanceFromMadGraph.java (original)
+++ java/branches/jeremy-dev/util/src/main/java/org/hps/util/CalculateAcceptanceFromMadGraph.java Tue Nov 3 14:41:17 2015
@@ -21,7 +21,7 @@
import org.apache.commons.cli.Option;
import org.apache.commons.cli.Options;
import org.apache.commons.cli.ParseException;
-import org.apache.commons.cli.PosixParser;
+import org.apache.commons.cli.DefaultParser;
import org.lcsim.fit.helicaltrack.HelixParamCalculator;
public class CalculateAcceptanceFromMadGraph {
@@ -165,7 +165,7 @@
// Set up command line parsing.
Options options = createCommandLineOptions();
- CommandLineParser parser = new PosixParser();
+ CommandLineParser parser = new DefaultParser();
// Parse command line arguments.
CommandLine cl = null;
Modified: java/branches/jeremy-dev/util/src/main/java/org/hps/util/ConvertToStdhep.java
=============================================================================
--- java/branches/jeremy-dev/util/src/main/java/org/hps/util/ConvertToStdhep.java (original)
+++ java/branches/jeremy-dev/util/src/main/java/org/hps/util/ConvertToStdhep.java Tue Nov 3 14:41:17 2015
@@ -31,7 +31,7 @@
import org.apache.commons.cli.Option;
import org.apache.commons.cli.Options;
import org.apache.commons.cli.ParseException;
-import org.apache.commons.cli.PosixParser;
+import org.apache.commons.cli.DefaultParser;
import org.lcsim.detector.IRotation3D;
import org.lcsim.detector.RotationGeant;
@@ -95,7 +95,7 @@
// Set up command line parsing.
Options options = createCommandLineOptions();
- CommandLineParser parser = new PosixParser();
+ CommandLineParser parser = new DefaultParser();
// Parse command line arguments.
CommandLine cl = null;
Modified: java/branches/jeremy-dev/util/src/main/java/org/hps/util/DumpLHEEventsToASCII.java
=============================================================================
--- java/branches/jeremy-dev/util/src/main/java/org/hps/util/DumpLHEEventsToASCII.java (original)
+++ java/branches/jeremy-dev/util/src/main/java/org/hps/util/DumpLHEEventsToASCII.java Tue Nov 3 14:41:17 2015
@@ -26,7 +26,7 @@
import org.apache.commons.cli.Option;
import org.apache.commons.cli.Options;
import org.apache.commons.cli.ParseException;
-import org.apache.commons.cli.PosixParser;
+import org.apache.commons.cli.DefaultParser;
import org.lcsim.detector.IRotation3D;
import org.lcsim.detector.RotationGeant;
@@ -89,7 +89,7 @@
// Set up command line parsing.
Options options = createCommandLineOptions();
- CommandLineParser parser = new PosixParser();
+ CommandLineParser parser = new DefaultParser();
// Parse command line arguments.
CommandLine cl = null;
|
