Merge branch 'development' into iss59-detChangedHook2-merged

JeffersonLab · Aug 13, 2024 · 7906a83 · 7906a83
2 parents ce84c13 + 5959855
commit 7906a83
Show file tree

Hide file tree

Showing 87 changed files with 482 additions and 255 deletions.
diff --git a/bin/bg-merger b/bin/bg-merger
@@ -1,6 +1,6 @@
 #!/bin/bash
 
-. `dirname $0`/env.sh 
+. `dirname $0`/../libexec/env.sh
 
 export MALLOC_ARENA_MAX=1
 

diff --git a/bin/bos2hipo b/bin/bos2hipo
@@ -1,6 +1,6 @@
 #!/bin/bash
 
-. `dirname $0`/env.sh 
+. `dirname $0`/../libexec/env.sh
 
 java -Xms1024m -XX:+UseSerialGC \
     -cp "$CLAS12DIR/lib/clas/*:$CLAS12DIR/lib/plugins/*" \

diff --git a/bin/cvt-compare b/bin/cvt-compare
@@ -1,6 +1,6 @@
 #!/bin/bash
 
-. `dirname $0`/env.sh 
+. `dirname $0`/../libexec/env.sh
 
 export MALLOC_ARENA_MAX=1
 

diff --git a/bin/daqEventViewer b/bin/daqEventViewer
@@ -1,6 +1,6 @@
 #!/bin/bash
 
-. `dirname $0`/env.sh 
+. `dirname $0`/../libexec/env.sh
 
 java -Xms1024m \
     -cp "$CLAS12DIR/lib/clas/*:$CLAS12DIR/lib/services/*:$CLAS12DIR/lib/utils/*" \

diff --git a/bin/dclayereffs-ana b/bin/dclayereffs-ana
@@ -1,6 +1,6 @@
 #!/bin/bash
 
-. `dirname $0`/env.sh 
+. `dirname $0`/../libexec/env.sh
 
 java -Dsun.java2d.pmoffscreen=false -Xmx2048m -Xms1024m \
     -cp "$CLAS12DIR/lib/clas/*:$CLAS12DIR/lib/utils/*:$CLAS12DIR/lib/services/*" \

diff --git a/bin/decoder b/bin/decoder
@@ -1,6 +1,6 @@
 #!/bin/bash
 
-. `dirname $0`/env.sh 
+. `dirname $0`/../libexec/env.sh
 
 export MALLOC_ARENA_MAX=1
 

diff --git a/bin/dict-generator b/bin/dict-generator
@@ -1,6 +1,6 @@
 #!/bin/bash
 
-. `dirname $0`/env.sh 
+. `dirname $0`/../libexec/env.sh
 
 export MALLOC_ARENA_MAX=1
 

diff --git a/bin/dict-maker b/bin/dict-maker
@@ -1,6 +1,6 @@
 #!/bin/bash
 
-. `dirname $0`/env.sh 
+. `dirname $0`/../libexec/env.sh
 
 export MALLOC_ARENA_MAX=1
 

diff --git a/bin/dict-merger b/bin/dict-merger
@@ -1,6 +1,6 @@
 #!/bin/bash
 
-. `dirname $0`/env.sh 
+. `dirname $0`/../libexec/env.sh
 
 export MALLOC_ARENA_MAX=1
 

diff --git a/bin/dict-validator b/bin/dict-validator
@@ -1,6 +1,6 @@
 #!/bin/bash
 
-. `dirname $0`/env.sh 
+. `dirname $0`/../libexec/env.sh
 
 export MALLOC_ARENA_MAX=1
 

diff --git a/bin/evio-viewer b/bin/evio-viewer
@@ -1,5 +1,5 @@
 #!/bin/bash
 
-. `dirname $0`/env.sh 
+. `dirname $0`/../libexec/env.sh
 
 java -cp "$CLAS12DIR/lib/clas/*" org.jlab.coda.eventViewer.EventTreeFrame $*
diff --git a/bin/evio2hipo b/bin/evio2hipo
@@ -1,6 +1,6 @@
 #!/bin/bash
 
-. `dirname $0`/env.sh 
+. `dirname $0`/../libexec/env.sh
 
 export MALLOC_ARENA_MAX=1
 

diff --git a/bin/eviocure b/bin/eviocure
@@ -1,6 +1,6 @@
 #!/bin/bash
 
-. `dirname $0`/env.sh 
+. `dirname $0`/../libexec/env.sh
 
 export MALLOC_ARENA_MAX=1
 

diff --git a/bin/eviodump b/bin/eviodump
@@ -1,6 +1,6 @@
 #!/bin/bash
 
-. `dirname $0`/env.sh 
+. `dirname $0`/../libexec/env.sh
 
 java -Xms1024m \
     -cp "$CLAS12DIR/lib/clas/*:$CLAS12DIR/lib/plugins/*" \

diff --git a/bin/hipo-add b/bin/hipo-add
@@ -1,6 +1,6 @@
 #!/bin/bash
 
-. `dirname $0`/env.sh 
+. `dirname $0`/../libexec/env.sh
 
 java -Xms1024m \
     -cp "$CLAS12DIR/lib/clas/*:$CLAS12DIR/lib/plugins/*" \

diff --git a/bin/hipo-browser b/bin/hipo-browser
@@ -1,6 +1,6 @@
 #!/bin/bash
 
-. `dirname $0`/env.sh 
+. `dirname $0`/../libexec/env.sh
 
 java -Xms1024m \
     -cp "$CLAS12DIR/lib/clas/*:$CLAS12DIR/lib/plugins/*" \

diff --git a/bin/hipo-diff b/bin/hipo-diff
@@ -1,6 +1,6 @@
 #!/bin/bash
 
-. `dirname $0`/env.sh 
+. `dirname $0`/../libexec/env.sh
 
 export MALLOC_ARENA_MAX=1
 

diff --git a/bin/hipo-json b/bin/hipo-json
@@ -1,6 +1,6 @@
 #!/bin/bash
 
-. `dirname $0`/env.sh 
+. `dirname $0`/../libexec/env.sh
 
 java -Xms1024m \
     -cp "$CLAS12DIR/lib/clas/*:$CLAS12DIR/lib/plugins/*" \

diff --git a/bin/hipo-utils b/bin/hipo-utils
@@ -1,6 +1,6 @@
 #!/bin/bash
 
-. `dirname $0`/env.sh 
+. `dirname $0`/../libexec/env.sh
 
 export MALLOC_ARENA_MAX=1
 

diff --git a/bin/postprocess b/bin/postprocess
@@ -1,6 +1,6 @@
 #!/bin/bash
 
-. `dirname $0`/env.sh 
+. `dirname $0`/../libexec/env.sh
 
 export MALLOC_ARENA_MAX=1
 

diff --git a/bin/rebuild-scalers b/bin/rebuild-scalers
@@ -1,6 +1,6 @@
 #!/bin/bash
 
-. `dirname $0`/env.sh 
+. `dirname $0`/../libexec/env.sh
 
 export MALLOC_ARENA_MAX=1
 

diff --git a/bin/recon-util b/bin/recon-util
@@ -1,6 +1,6 @@
 #!/bin/bash
 
-. `dirname $0`/env.sh 
+. `dirname $0`/../libexec/env.sh
 
 export MALLOC_ARENA_MAX=1
 

diff --git a/bin/run-groovy b/bin/run-groovy
@@ -1,6 +1,6 @@
 #!/bin/bash
 
-. `dirname $0`/env.sh groovy
+. `dirname $0`/../libexec/env.sh groovy
 
 echo """
 ****************************************

diff --git a/bin/run-groovysh b/bin/run-groovysh
@@ -1,6 +1,6 @@
 #!/bin/bash
 
-. `dirname $0`/env.sh groovy
+. `dirname $0`/../libexec/env.sh groovy
 
 echo """
 ***************************************

diff --git a/bin/run-jshell b/bin/run-jshell
@@ -1,6 +1,6 @@
 #!/bin/bash
 
-. `dirname $0`/env.sh jshell
+. `dirname $0`/../libexec/env.sh jshell
 
 echo """
 *********************************

diff --git a/bin/trigger-filter b/bin/trigger-filter
@@ -1,6 +1,6 @@
 #!/bin/bash
 
-. `dirname $0`/env.sh 
+. `dirname $0`/../libexec/env.sh
 
 export MALLOC_ARENA_MAX=1
 

diff --git a/bin/trigger-splitter b/bin/trigger-splitter
@@ -1,6 +1,6 @@
 #!/bin/bash
 
-. `dirname $0`/env.sh 
+. `dirname $0`/../libexec/env.sh
 
 export MALLOC_ARENA_MAX=1
 

diff --git a/build-coatjava.sh b/build-coatjava.sh
@@ -61,9 +61,9 @@ download () {
 }
 
 
-# download the default field maps, as defined in bin/env.sh:
+# download the default field maps, as defined in libexec/env.sh:
 # (and duplicated in etc/services/reconstruction.yaml):
-source `dirname $0`/bin/env.sh
+source `dirname $0`/libexec/env.sh
 if [ $downloadMaps == "yes" ]; then
   echo 'Retrieving field maps ...'
   webDir=https://clasweb.jlab.org/clas12offline/magfield
@@ -87,6 +87,7 @@ rm -rf coatjava
 mkdir -p coatjava
 cp -r bin coatjava/
 cp -r etc coatjava/
+cp -r libexec coatjava/
 
 # create schema directories for partial reconstruction outputs
 which python3 >& /dev/null && python=python3 || python=python

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>10.1.2-SNAPSHOT</version>
+  <version>11.0.0-SNAPSHOT</version>
   <packaging>jar</packaging>
 
   <parent>
     <groupId>org.jlab.clas</groupId>
     <artifactId>clas12rec</artifactId>
     <relativePath>../../parent/pom.xml</relativePath>
-    <version>10.1.2-SNAPSHOT</version>
+    <version>11.0.0-SNAPSHOT</version>
   </parent>
 
   <dependencies>

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>10.1.2-SNAPSHOT</version>
+  <version>11.0.0-SNAPSHOT</version>
   <packaging>jar</packaging>
 
   <parent>
     <groupId>org.jlab.clas</groupId>
     <artifactId>clas12rec</artifactId>
     <relativePath>../../parent/pom.xml</relativePath>
-    <version>10.1.2-SNAPSHOT</version>
+    <version>11.0.0-SNAPSHOT</version>
   </parent>
 
   <dependencies>
     <dependency>
       <groupId>org.jlab.clas</groupId>
       <artifactId>clas-utils</artifactId>
-      <version>10.1.2-SNAPSHOT</version>
+      <version>11.0.0-SNAPSHOT</version>
     </dependency>
 
     <dependency>
       <groupId>org.jlab.clas</groupId>
       <artifactId>clas-physics</artifactId>
-      <version>10.1.2-SNAPSHOT</version>
+      <version>11.0.0-SNAPSHOT</version>
     </dependency>
 
     <dependency>
       <groupId>org.jlab.clas</groupId>
       <artifactId>clas-io</artifactId>
-      <version>10.1.2-SNAPSHOT</version>
+      <version>11.0.0-SNAPSHOT</version>
     </dependency> 
 
     <dependency>
       <groupId>org.jlab.clas</groupId>
       <artifactId>clas-geometry</artifactId>
-      <version>10.1.2-SNAPSHOT</version>
+      <version>11.0.0-SNAPSHOT</version>
     </dependency>
 
     <dependency>
       <groupId>org.jlab.clas</groupId>
       <artifactId>clas-jcsg</artifactId>
-      <version>10.1.2-SNAPSHOT</version>
+      <version>11.0.0-SNAPSHOT</version>
     </dependency>
 
     <dependency>
       <groupId>org.jlab.clas</groupId>
       <artifactId>swim-tools</artifactId>
-      <version>10.1.2-SNAPSHOT</version>
+      <version>11.0.0-SNAPSHOT</version>
     </dependency>
 
     <dependency>
       <groupId>org.jlab.clas</groupId>
       <artifactId>clas-detector</artifactId>
-      <version>10.1.2-SNAPSHOT</version>
+      <version>11.0.0-SNAPSHOT</version>
     </dependency>
 
     <dependency>
       <groupId>org.jlab.clas</groupId>
       <artifactId>clas-reco</artifactId>
-      <version>10.1.2-SNAPSHOT</version>
+      <version>11.0.0-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>10.1.2-SNAPSHOT</version>
+  <version>11.0.0-SNAPSHOT</version>
   <packaging>jar</packaging>
 
   <parent>
     <groupId>org.jlab.clas</groupId>
     <artifactId>clas12rec</artifactId>
     <relativePath>../../parent/pom.xml</relativePath>
-    <version>10.1.2-SNAPSHOT</version>
+    <version>11.0.0-SNAPSHOT</version>
   </parent>
 
   <dependencies>
     <dependency>
       <groupId>org.jlab.clas</groupId>
       <artifactId>clas-utils</artifactId>
-      <version>10.1.2-SNAPSHOT</version>
+      <version>11.0.0-SNAPSHOT</version>
     </dependency>
 
     <dependency>
@@ -29,13 +29,13 @@
     <dependency>
       <groupId>org.jlab.clas</groupId>
       <artifactId>clas-io</artifactId>
-      <version>10.1.2-SNAPSHOT</version>
+      <version>11.0.0-SNAPSHOT</version>
     </dependency> 
 
     <dependency>
       <groupId>org.jlab.clas</groupId>
       <artifactId>clas-geometry</artifactId>
-      <version>10.1.2-SNAPSHOT</version>
+      <version>11.0.0-SNAPSHOT</version>
     </dependency>
   </dependencies>
 

diff --git a/common-tools/clas-detector/src/main/java/org/jlab/detector/base/GeometryFactory.java b/common-tools/clas-detector/src/main/java/org/jlab/detector/base/GeometryFactory.java
@@ -48,6 +48,7 @@ public static ConstantProvider getConstants(DetectorType type, int run, String v
             provider.loadTable("/geometry/dc/alignment");
             provider.loadTable("/geometry/dc/ministagger");
 	    provider.loadTable("/geometry/dc/endplatesbow");
+	    provider.loadTable("/geometry/dc/feedthroughs");
         }
 
         if(type==DetectorType.ECAL){

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>10.1.2-SNAPSHOT</version>
+  <version>11.0.0-SNAPSHOT</version>
   <packaging>jar</packaging>
 
   <parent>
     <groupId>org.jlab.clas</groupId>
     <artifactId>clas12rec</artifactId>
     <relativePath>../../parent/pom.xml</relativePath>
-    <version>10.1.2-SNAPSHOT</version>
+    <version>11.0.0-SNAPSHOT</version>
   </parent>
 
   <dependencies>