Author: [log in to unmask] Date: Mon Jun 22 13:03:42 2015 New Revision: 3178 Log: fix debug Modified: java/trunk/conditions/src/main/java/org/hps/conditions/run/RunSpreadsheet.java java/trunk/conditions/src/main/java/org/hps/conditions/svt/SvtBiasConditionsLoader.java java/trunk/conditions/src/main/java/org/hps/conditions/svt/SvtBiasMyaDumpReader.java Modified: java/trunk/conditions/src/main/java/org/hps/conditions/run/RunSpreadsheet.java ============================================================================= --- java/trunk/conditions/src/main/java/org/hps/conditions/run/RunSpreadsheet.java (original) +++ java/trunk/conditions/src/main/java/org/hps/conditions/run/RunSpreadsheet.java Mon Jun 22 13:03:42 2015 @@ -162,7 +162,7 @@ private static Date parseStartDate(CSVRecord record) throws ParseException { - System.out.printf("Start date result of parsing %s %s is %s since epoch %d \n",record.get("date"), record.get("start_time"),DATE_FORMAT.parse(record.get("date") + " " + record.get("start_time")).toString(), DATE_FORMAT.parse(record.get("date") + " " + record.get("start_time")).getTime() ); + //System.out.printf("Start date result of parsing %s %s is %s since epoch %d \n",record.get("date"), record.get("start_time"),DATE_FORMAT.parse(record.get("date") + " " + record.get("start_time")).toString(), DATE_FORMAT.parse(record.get("date") + " " + record.get("start_time")).getTime() ); return DATE_FORMAT.parse(record.get("date") + " " + record.get("start_time")); } Modified: java/trunk/conditions/src/main/java/org/hps/conditions/svt/SvtBiasConditionsLoader.java ============================================================================= --- java/trunk/conditions/src/main/java/org/hps/conditions/svt/SvtBiasConditionsLoader.java (original) +++ java/trunk/conditions/src/main/java/org/hps/conditions/svt/SvtBiasConditionsLoader.java Mon Jun 22 13:03:42 2015 @@ -18,6 +18,7 @@ import org.apache.commons.cli.CommandLine; import org.apache.commons.cli.CommandLineParser; +import org.apache.commons.cli.HelpFormatter; import org.apache.commons.cli.Option; import org.apache.commons.cli.Options; import org.apache.commons.cli.ParseException; @@ -169,6 +170,9 @@ } + + + /** * Load SVT HV bias constants into the conditions database. * @@ -190,16 +194,19 @@ throw new RuntimeException("Cannot parse.", e); } - - - + if(!cl.hasOption("c") || !cl.hasOption("m")) { + printUsage(options); + return; + } + + + // Setup plots setupPlots(cl.hasOption("s")?true:false); // Load in CSV records from the exported run spreadsheet. final String path = cl.getOptionValue("c"); - logger.info(path); RunMap runmap = getRunMapFromSpreadSheet(path); @@ -247,6 +254,12 @@ } + + private static void printUsage(Options options) { + HelpFormatter formatter = new HelpFormatter(); + formatter.printHelp("Need to adhere to these options", options); + + } private final static SvtBiasConstantCollection findCollection(final List<SvtBiasConstantCollection> list, Date date) { for( SvtBiasConstantCollection collection : list) { Modified: java/trunk/conditions/src/main/java/org/hps/conditions/svt/SvtBiasMyaDumpReader.java ============================================================================= --- java/trunk/conditions/src/main/java/org/hps/conditions/svt/SvtBiasMyaDumpReader.java (original) +++ java/trunk/conditions/src/main/java/org/hps/conditions/svt/SvtBiasMyaDumpReader.java Mon Jun 22 13:03:42 2015 @@ -141,14 +141,14 @@ if( e.getValue() > BIASVALUEON) { if (range==null) { - logger.info("BIAS ON: " + e.toString()); + logger.fine("BIAS ON: " + e.toString()); range = new SvtBiasMyaRange(); range.setStart(e); } } else { //close it if (range!=null) { - logger.info("BIAS TURNED OFF: " + e.toString()); + logger.fine("BIAS TURNED OFF: " + e.toString()); range.setEnd(e); this.biasRanges.add(range); range = null;