Merge branch 'development' into java21

JeffersonLab · Sep 19, 2024 · 41d62b4 · 41d62b4
2 parents 13c3389 + 9a56261
commit 41d62b4
Show file tree

Hide file tree

Showing 49 changed files with 179 additions and 155 deletions.
diff --git a/bin/hipo-add b/bin/hipo-add
diff --git a/bin/hipo-merge-histograms b/bin/hipo-merge-histograms
@@ -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 $*
diff --git a/common-tools/clara-io/pom.xml b/common-tools/clara-io/pom.xml
@@ -3,14 +3,14 @@
   <modelVersion>4.0.0</modelVersion>
   <groupId>org.jlab.clas</groupId>
   <artifactId>clara-io</artifactId>
-  <version>11.0.1-SNAPSHOT</version>
+  <version>11.0.2-SNAPSHOT</version>
   <packaging>jar</packaging>
 
   <parent>
     <groupId>org.jlab.clas</groupId>
     <artifactId>clas12rec</artifactId>
     <relativePath>../../parent/pom.xml</relativePath>
-    <version>11.0.1-SNAPSHOT</version>
+    <version>11.0.2-SNAPSHOT</version>
   </parent>
 
   <dependencies>

diff --git a/common-tools/clara-io/src/main/java/org/jlab/io/clara/HipoToHipoWriter.java b/common-tools/clara-io/src/main/java/org/jlab/io/clara/HipoToHipoWriter.java
@@ -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 {

diff --git a/common-tools/clas-analysis/pom.xml b/common-tools/clas-analysis/pom.xml
@@ -3,63 +3,63 @@
   <modelVersion>4.0.0</modelVersion>
   <groupId>org.jlab.clas</groupId>
   <artifactId>clas-analysis</artifactId>
-  <version>11.0.1-SNAPSHOT</version>
+  <version>11.0.2-SNAPSHOT</version>
   <packaging>jar</packaging>
 
   <parent>
     <groupId>org.jlab.clas</groupId>
     <artifactId>clas12rec</artifactId>
     <relativePath>../../parent/pom.xml</relativePath>
-    <version>11.0.1-SNAPSHOT</version>
+    <version>11.0.2-SNAPSHOT</version>
   </parent>
 
   <dependencies>
     <dependency>
       <groupId>org.jlab.clas</groupId>
       <artifactId>clas-utils</artifactId>
-      <version>11.0.1-SNAPSHOT</version>
+      <version>11.0.2-SNAPSHOT</version>
     </dependency>
 
     <dependency>
       <groupId>org.jlab.clas</groupId>
       <artifactId>clas-physics</artifactId>
-      <version>11.0.1-SNAPSHOT</version>
+      <version>11.0.2-SNAPSHOT</version>
     </dependency>
 
     <dependency>
       <groupId>org.jlab.clas</groupId>
       <artifactId>clas-io</artifactId>
-      <version>11.0.1-SNAPSHOT</version>
+      <version>11.0.2-SNAPSHOT</version>
     </dependency> 
 
     <dependency>
       <groupId>org.jlab.clas</groupId>
       <artifactId>clas-geometry</artifactId>
-      <version>11.0.1-SNAPSHOT</version>
+      <version>11.0.2-SNAPSHOT</version>
     </dependency>
 
     <dependency>
       <groupId>org.jlab.clas</groupId>
       <artifactId>clas-jcsg</artifactId>
-      <version>11.0.1-SNAPSHOT</version>
+      <version>11.0.2-SNAPSHOT</version>
     </dependency>
 
     <dependency>
       <groupId>org.jlab.clas</groupId>
       <artifactId>swim-tools</artifactId>
-      <version>11.0.1-SNAPSHOT</version>
+      <version>11.0.2-SNAPSHOT</version>
     </dependency>
 
     <dependency>
       <groupId>org.jlab.clas</groupId>
       <artifactId>clas-detector</artifactId>
-      <version>11.0.1-SNAPSHOT</version>
+      <version>11.0.2-SNAPSHOT</version>
     </dependency>
 
     <dependency>
       <groupId>org.jlab.clas</groupId>
       <artifactId>clas-reco</artifactId>
-      <version>11.0.1-SNAPSHOT</version>
+      <version>11.0.2-SNAPSHOT</version>
     </dependency>
   </dependencies>
 

diff --git a/common-tools/clas-detector/pom.xml b/common-tools/clas-detector/pom.xml
@@ -3,21 +3,21 @@
   <modelVersion>4.0.0</modelVersion>
   <groupId>org.jlab.clas</groupId>
   <artifactId>clas-detector</artifactId>
-  <version>11.0.1-SNAPSHOT</version>
+  <version>11.0.2-SNAPSHOT</version>
   <packaging>jar</packaging>
 
   <parent>
     <groupId>org.jlab.clas</groupId>
     <artifactId>clas12rec</artifactId>
     <relativePath>../../parent/pom.xml</relativePath>
-    <version>11.0.1-SNAPSHOT</version>
+    <version>11.0.2-SNAPSHOT</version>
   </parent>
 
   <dependencies>
     <dependency>
       <groupId>org.jlab.clas</groupId>
       <artifactId>clas-utils</artifactId>
-      <version>11.0.1-SNAPSHOT</version>
+      <version>11.0.2-SNAPSHOT</version>
     </dependency>
 
     <dependency>
@@ -29,13 +29,13 @@
     <dependency>
       <groupId>org.jlab.clas</groupId>
       <artifactId>clas-io</artifactId>
-      <version>11.0.1-SNAPSHOT</version>
+      <version>11.0.2-SNAPSHOT</version>
     </dependency> 
 
     <dependency>
       <groupId>org.jlab.clas</groupId>
       <artifactId>clas-geometry</artifactId>
-      <version>11.0.1-SNAPSHOT</version>
+      <version>11.0.2-SNAPSHOT</version>
     </dependency>
   </dependencies>
 

diff --git a/common-tools/clas-geometry/pom.xml b/common-tools/clas-geometry/pom.xml
@@ -3,14 +3,14 @@
   <modelVersion>4.0.0</modelVersion>
   <groupId>org.jlab.clas</groupId>
   <artifactId>clas-geometry</artifactId>
-  <version>11.0.1-SNAPSHOT</version>
+  <version>11.0.2-SNAPSHOT</version>
   <packaging>jar</packaging>
 
   <parent>
     <groupId>org.jlab.clas</groupId>
     <artifactId>clas12rec</artifactId>
     <relativePath>../../parent/pom.xml</relativePath>
-    <version>11.0.1-SNAPSHOT</version>
+    <version>11.0.2-SNAPSHOT</version>
   </parent>
 
   <dependencies>

diff --git a/common-tools/clas-io/pom.xml b/common-tools/clas-io/pom.xml
@@ -3,14 +3,14 @@
   <modelVersion>4.0.0</modelVersion>
   <groupId>org.jlab.clas</groupId>
   <artifactId>clas-io</artifactId>
-  <version>11.0.1-SNAPSHOT</version>
+  <version>11.0.2-SNAPSHOT</version>
   <packaging>jar</packaging>
 
   <parent>
     <groupId>org.jlab.clas</groupId>
     <artifactId>clas12rec</artifactId>
     <relativePath>../../parent/pom.xml</relativePath>
-    <version>11.0.1-SNAPSHOT</version>
+    <version>11.0.2-SNAPSHOT</version>
   </parent>
 
   <dependencies>
@@ -90,13 +90,13 @@
     <dependency>
       <groupId>org.jlab.clas</groupId>
       <artifactId>clas-utils</artifactId>
-      <version>11.0.1-SNAPSHOT</version>
+      <version>11.0.2-SNAPSHOT</version>
     </dependency>
 
     <dependency>
         <groupId>org.jlab.clas</groupId>
         <artifactId>clas-logging</artifactId>
-        <version>11.0.1-SNAPSHOT</version>
+        <version>11.0.2-SNAPSHOT</version>
         <scope>compile</scope>
     </dependency>
 

diff --git a/common-tools/clas-jcsg/pom.xml b/common-tools/clas-jcsg/pom.xml
@@ -3,14 +3,14 @@
   <modelVersion>4.0.0</modelVersion>
   <groupId>org.jlab.clas</groupId>
   <artifactId>clas-jcsg</artifactId>
-  <version>11.0.1-SNAPSHOT</version>
+  <version>11.0.2-SNAPSHOT</version>
   <packaging>jar</packaging>
 
   <parent>
     <groupId>org.jlab.clas</groupId>
     <artifactId>clas12rec</artifactId>
     <relativePath>../../parent/pom.xml</relativePath>
-    <version>11.0.1-SNAPSHOT</version>
+    <version>11.0.2-SNAPSHOT</version>
   </parent>
 
   <dependencies>
@@ -27,12 +27,12 @@
     <dependency>
       <groupId>org.jlab.clas</groupId>
       <artifactId>clas-geometry</artifactId>
-      <version>11.0.1-SNAPSHOT</version>
+      <version>11.0.2-SNAPSHOT</version>
     </dependency>
     <dependency>
       <groupId>org.jlab.clas</groupId>
       <artifactId>clas-detector</artifactId>
-      <version>11.0.1-SNAPSHOT</version>
+      <version>11.0.2-SNAPSHOT</version>
     </dependency>
     <dependency>
       <groupId>java3d</groupId>

diff --git a/common-tools/clas-logging/pom.xml b/common-tools/clas-logging/pom.xml
@@ -3,14 +3,14 @@
   <modelVersion>4.0.0</modelVersion>
   <groupId>org.jlab.clas</groupId>
   <artifactId>clas-logging</artifactId>
-  <version>11.0.1-SNAPSHOT</version>
+  <version>11.0.2-SNAPSHOT</version>
   <packaging>jar</packaging>
 
   <parent>
     <groupId>org.jlab.clas</groupId>
     <artifactId>clas12rec</artifactId>
     <relativePath>../../parent/pom.xml</relativePath>
-    <version>11.0.1-SNAPSHOT</version>
+    <version>11.0.2-SNAPSHOT</version>
   </parent>
 
 </project>
diff --git a/common-tools/clas-math/pom.xml b/common-tools/clas-math/pom.xml
@@ -3,14 +3,14 @@
   <modelVersion>4.0.0</modelVersion>
   <groupId>org.jlab.clas</groupId>
   <artifactId>clas-math</artifactId>
-  <version>11.0.1-SNAPSHOT</version>
+  <version>11.0.2-SNAPSHOT</version>
   <packaging>jar</packaging>
 
   <parent>
     <groupId>org.jlab.clas</groupId>
     <artifactId>clas12rec</artifactId>
     <relativePath>../../parent/pom.xml</relativePath>
-    <version>11.0.1-SNAPSHOT</version>
+    <version>11.0.2-SNAPSHOT</version>
   </parent>
 
   <dependencies>

diff --git a/common-tools/clas-physics/pom.xml b/common-tools/clas-physics/pom.xml
@@ -4,14 +4,14 @@
 
   <groupId>org.jlab.clas</groupId>
   <artifactId>clas-physics</artifactId>
-  <version>11.0.1-SNAPSHOT</version>
+  <version>11.0.2-SNAPSHOT</version>
   <packaging>jar</packaging>
 
   <parent>
     <groupId>org.jlab.clas</groupId>
     <artifactId>clas12rec</artifactId>
     <relativePath>../../parent/pom.xml</relativePath>
-    <version>11.0.1-SNAPSHOT</version>
+    <version>11.0.2-SNAPSHOT</version>
   </parent>
 
 </project>