Merge branch 'development' into string-ccdb-tables

Author: baltzell

bin/hipo-add

@@ -0,0 +1,15 @@
+#!/usr/bin/env bash
+
+. `dirname $0`/../libexec/env.sh
+cmd="java -Xms1024m -cp $CLAS12DIR/lib/clas/*:$CLAS12DIR/lib/plugins/* org.jlab.groot.data.TDirectory"
+
+if [ $# -eq 0 ]; then
+  echo """
+  hipo-merge-histograms
+  - merge histogram HIPO files
+  - to merge HIPO data files, use 'hipo-utils -merge' instead"""
+  $cmd | sed 's;\<hadd\>;hipo-merge-histograms;g'
+  exit 2
+fi
+
+$cmd $*

bin/hipo-merge-histograms

@@ -11,6 +11,7 @@
 import org.jlab.clara.std.services.EventWriterException;
 import org.jlab.jnp.hipo4.data.Bank;
 import org.jlab.jnp.hipo4.data.Event;
+import org.jlab.jnp.hipo4.data.SchemaFactory;
 import org.jlab.jnp.hipo4.io.HipoWriter;
 import org.jlab.jnp.hipo4.io.HipoWriterSorted;
 import org.jlab.jnp.utils.file.FileUtils;
@@ -25,6 +26,8 @@ public class HipoToHipoWriter extends AbstractEventWriterService<HipoWriterSorte
     private static final String CONF_COMPRESSION = "compression";
     private static final String CONF_SCHEMA_DIR = "schema_dir";
     private static final String CONF_SCHEMA_FILTER = "schema_filter";
+    private static final String CONF_SCHEMA_WILDCARD = "wildcard";
+    
     private final List<Bank> schemaBankList = new ArrayList<Bank>();
     private final StringSubstitutor envSubstitutor = new StringSubstitutor(System.getenv());
 
@@ -56,9 +59,19 @@ private void configure(HipoWriterSorted writer, JSONObject opts) {
             schemaDir = envSubstitutor.replace(schemaDir);
             System.out.printf("%s service: schema directory = %s%n", getName(), schemaDir);
         }
-        writer.getSchemaFactory().initFromDirectory(schemaDir);
 
-        if (opts.has(CONF_SCHEMA_DIR)) {
+        SchemaFactory factory = new SchemaFactory();
+        factory.initFromDirectory(schemaDir);
+
+        if(opts.has(CONF_SCHEMA_WILDCARD)==true){
+            String wildcard = opts.getString("wildcard");
+            SchemaFactory f2 = factory.reduce(wildcard);
+            writer.getSchemaFactory().copy(f2);
+        } else {
+            writer.getSchemaFactory().copy(factory);
+        }
+        
+        if (opts.has(CONF_SCHEMA_DIR)==true||opts.has(CONF_SCHEMA_WILDCARD)==true) {
             boolean useFilter = opts.optBoolean(CONF_SCHEMA_FILTER, true);
             System.out.printf("%s service: schema filter = %b%n", getName(), useFilter);
             if(useFilter==true){
@@ -69,6 +82,10 @@ private void configure(HipoWriterSorted writer, JSONObject opts) {
                 }
             }
         }
+        
+        System.out.printf("SERVICE WRITER :: [filter] %s\n",opts.has(HipoToHipoWriter.CONF_SCHEMA_FILTER));
+        System.out.printf("SERVICE WRITER :: [dir] %s\n",opts.has(HipoToHipoWriter.CONF_SCHEMA_DIR));
+        System.out.printf("SERVICE WRITER :: [wildcard] %s\n",opts.has(HipoToHipoWriter.CONF_SCHEMA_WILDCARD));
     }
 
     private Method getSchemaFilterSetter() throws NoSuchMethodException, SecurityException {

common-tools/clara-io/src/main/java/org/jlab/io/clara/HipoToHipoWriter.java

@@ -30,7 +30,7 @@ if [ $# -ge 1 ]; then
     # additional variables and settings for groovy
     if [ "$1" = "groovy" ]; then
       JYPATH="${JYPATH:+${JYPATH}:}${CLAS12DIR}/lib/packages"
-      export JAVA_OPTS="-Dsun.java2d.pmoffscreen=false -Djava.util.logging.config.file=$CLAS12DIR/etc/logging/debug.properties -Xms1024m -Xmx2048m -XX:+UseSerialGC"
+      export JAVA_OPTS="-Dsun.java2d.pmoffscreen=false -Djava.util.logging.config.file=$CLAS12DIR/etc/logging/debug.properties -Xms1024m -Xmx2048m -XX:+UseSerialGC ${JAVA_OPTS-}"
     fi
 
     export JYPATH