From 35bf94c3d599a01ec77cedc2d3f97f24a5728eba Mon Sep 17 00:00:00 2001 From: Raffaella De Vita Date: Mon, 3 Jul 2023 18:50:34 +0200 Subject: [PATCH] clean up os tool usage printouts --- .../java/org/jlab/analysis/roads/DictionaryCreator.java | 8 +++----- .../java/org/jlab/analysis/roads/DictionaryGenerator.java | 4 ++-- .../java/org/jlab/analysis/roads/DictionaryValidator.java | 5 +++-- 3 files changed, 8 insertions(+), 9 deletions(-) diff --git a/common-tools/clas-analysis/src/main/java/org/jlab/analysis/roads/DictionaryCreator.java b/common-tools/clas-analysis/src/main/java/org/jlab/analysis/roads/DictionaryCreator.java index 8c7b508e33..0f5a25e052 100644 --- a/common-tools/clas-analysis/src/main/java/org/jlab/analysis/roads/DictionaryCreator.java +++ b/common-tools/clas-analysis/src/main/java/org/jlab/analysis/roads/DictionaryCreator.java @@ -72,10 +72,11 @@ public static void main(String[] args) { DefaultLogger.debug(); - OptionParser parser = new OptionParser("dict-validation"); + OptionParser parser = new OptionParser("dict-maker"); + parser.setRequiresInputList(false); parser.addRequired("-o" , "dictionary file name"); parser.addRequired("-i" , "event file"); - parser.addOption("-pid" , "0", "select particle PID for new dictonary, 0: no selection,"); + parser.addOption("-pid" , "0", "select particle PID for new dictionary, 0: no selection,"); parser.addOption("-charge" , "0", "select particle charge for new dictionary, 0: no selection"); parser.addOption("-threshold", "1", "select roads momentum threshold in GeV"); parser.addOption("-vzmin" , "-10", "minimum vz (cm)"); @@ -84,9 +85,6 @@ public static void main(String[] args) { parser.addOption("-dupli" , "1", "remove duplicates in dictionary creation, 0=false, 1=true"); parser.parse(args); - List arguments = new ArrayList(); - for(String item : args){ arguments.add(item); } - String dictionaryFileName = null; if(parser.hasOption("-o")==true) dictionaryFileName = parser.getOption("-o").stringValue(); diff --git a/common-tools/clas-analysis/src/main/java/org/jlab/analysis/roads/DictionaryGenerator.java b/common-tools/clas-analysis/src/main/java/org/jlab/analysis/roads/DictionaryGenerator.java index 49e3a479ec..1b4153c39d 100644 --- a/common-tools/clas-analysis/src/main/java/org/jlab/analysis/roads/DictionaryGenerator.java +++ b/common-tools/clas-analysis/src/main/java/org/jlab/analysis/roads/DictionaryGenerator.java @@ -341,8 +341,8 @@ public static void main(String[] args) { DefaultLogger.debug(); - OptionParser parser = new OptionParser("dict-maker"); - + OptionParser parser = new OptionParser("dict-generator"); + parser.setRequiresInputList(false); parser.addRequired("-torus", "torus scale"); parser.addRequired("-solenoid","solenoid scale"); parser.addRequired("-charge", "particle charge"); diff --git a/common-tools/clas-analysis/src/main/java/org/jlab/analysis/roads/DictionaryValidator.java b/common-tools/clas-analysis/src/main/java/org/jlab/analysis/roads/DictionaryValidator.java index 9c1786491a..70463b126a 100644 --- a/common-tools/clas-analysis/src/main/java/org/jlab/analysis/roads/DictionaryValidator.java +++ b/common-tools/clas-analysis/src/main/java/org/jlab/analysis/roads/DictionaryValidator.java @@ -306,10 +306,11 @@ public static void main(String[] args) { DefaultLogger.debug(); - OptionParser parser = new OptionParser("dict-validation"); + OptionParser parser = new OptionParser("dict-validator"); + parser.setRequiresInputList(false); parser.addRequired("-dict" , "dictionary file name"); parser.addRequired("-i" , "event file for dictionary test"); - parser.addOption("-pid" , "0", "select particle PID for new dictonary, 0: no selection,"); + parser.addOption("-pid" , "0", "select particle PID for new dictionary, 0: no selection,"); parser.addOption("-charge" , "0", "select particle charge for new dictionary, 0: no selection"); parser.addOption("-wire" , "1", "dc wire bin size in road finding"); parser.addOption("-strip" , "2", "pcal strip bin size in road finding");