Merge branch 'iss59-detChangedHook-redux' into iss59-detChangedHook-r…

…edux-dc
JeffersonLab · Jan 15, 2025 · cdabbb3 · cdabbb3
2 parents 9f3225f + 7e0a6b4
commit cdabbb3
Show file tree

Hide file tree

Showing 5 changed files with 38 additions and 17 deletions.
diff --git a/.github/workflows/maven.yml b/.github/workflows/maven.yml
@@ -68,7 +68,7 @@ jobs:
   # tests
   #############################################################################
 
-  test_coatjava:
+  pid:
     needs: [ build ]
     strategy:
       fail-fast: true
@@ -78,14 +78,16 @@ jobs:
         id:
           - kpp
           - eb-ep
+          - eb-en
           - eb-eg
           - eb-epc
           - eb-enc
           - eb-eftpi
         include:
-          # run all tests on ubuntu
+          # run selected tests on ubuntu
           - { id: kpp,      cmd: ./run-advanced-tests.sh }
           - { id: eb-ep,    cmd: ./run-eb-tests.sh -100 electronproton   }
+          - { id: eb-en,    cmd: ./run-eb-tests.sh -100 electronneutron  }
           - { id: eb-eg,    cmd: ./run-eb-tests.sh -100 electrongamma    }
           - { id: eb-epc,   cmd: ./run-eb-tests.sh -100 electronprotonC  }
           - { id: eb-enc,   cmd: ./run-eb-tests.sh -100 electronneutronC }
@@ -136,7 +138,7 @@ jobs:
   final:
     needs:
       - build
-      - test_coatjava
+      - pid
       - test_run-groovy
     runs-on: ubuntu-latest
     steps:

diff --git a/.github/workflows/validation.yml b/.github/workflows/validation.yml
@@ -11,3 +11,17 @@ jobs:
   if: false
   validation:
     uses: JeffersonLab/clas12-validation/.github/workflows/ci.yml@main
+    with:
+      matrix_evgen: >-
+        [
+          "e_p",
+          "e_n",
+          "e_g",
+          "e_pC",
+          "eFT_K",
+          "e_gFT"
+        ]
+      matrix_config: >-
+        [
+          "rgb_fall2019"
+        ]
diff --git a/common-tools/clas-analysis/src/main/java/org/jlab/analysis/efficiency/Truth.java b/common-tools/clas-analysis/src/main/java/org/jlab/analysis/efficiency/Truth.java
@@ -154,7 +154,10 @@ public String toTable() {
         for (int i=0; i<validPids.size(); ++i) {
             s.append(String.format("%6d",validPids.get(i)));
             for (int j=0; j<validPids.size(); ++j) {
-                s.append(String.format("%7.4f",get(validPids.get(i),validPids.get(j))));
+                if (mcTallies[i] > 0)
+                    s.append(String.format("%7.4f",get(validPids.get(i),validPids.get(j))));
+                else
+                    s.append(String.format("%7s","-"));
                 if (validPids.size()==j+1) s.append("\n");
             }
         }
@@ -168,16 +171,19 @@ public String toTable() {
     public JsonObject toJson() {
         JsonObject effs = new JsonObject();
         JsonArray pids = new JsonArray();
+        JsonObject gens = new JsonObject();
         for (int i=0; i<validPids.size(); ++i) {
             pids.add(validPids.get(i));
             JsonArray a = new JsonArray();
             for (int j=0; j<validPids.size(); ++j)
                 a.add(get(validPids.get(i),validPids.get(j)));
             effs.add(Integer.toString(validPids.get(i)),a);
+            gens.add(Integer.toString(validPids.get(i)), mcTallies[i]);
         }
         JsonObject ret = new JsonObject();
         ret.add("pids", pids);
         ret.add("effs", effs);
+        ret.add("gens", gens);
         return ret;
     }
 }
diff --git a/common-tools/coat-lib/pom.xml b/common-tools/coat-lib/pom.xml
@@ -225,17 +225,15 @@
                           </excludes>
                       </filter>
                   </filters>
-                  <transformers>
-                      <transformer implementation="org.apache.maven.plugins.shade.resource.ManifestResourceTransformer">
-                          <manifestEntries>
-                              <Specification-Title>${project.artifactId}</Specification-Title>
-                              <Specification-Version>${project.version}</Specification-Version>
-                              <Implementation-Title>${project.artifactId}</Implementation-Title>
-                              <Implementation-Version>${project.version}</Implementation-Version>
-                              <Implementation-Vendor-Id>${project.groupId}</Implementation-Vendor-Id>
-                          </manifestEntries>
-                      </transformer>
-                  </transformers>
+                  <transformer implementation="org.apache.maven.plugins.shade.resource.ManifestResourceTransformer">
+                      <manifestEntries>
+                          <Specification-Title>${project.artifactId}</Specification-Title>
+                          <Specification-Version>${project.version}</Specification-Version>
+                          <Implementation-Title>${project.artifactId}</Implementation-Title>
+                          <Implementation-Version>${project.version}</Implementation-Version>
+                          <Implementation-Vendor-Id>${project.groupId}</Implementation-Vendor-Id>
+                      </manifestEntries>
+                  </transformer>
               </configuration>
               <executions>
                   <execution>

diff --git a/validation/advanced-tests/src/eb/scripts/gemc.sh b/validation/advanced-tests/src/eb/scripts/gemc.sh
@@ -1,5 +1,7 @@
 #!/bin/sh
 
+set -e
+
 usage() { echo "Usage: $0 [-g GEMC] [-n NEV] [-p PARTS] [-c GCARD] [-m]" 1>&2; exit $1; }
 
 run=11
@@ -64,8 +66,7 @@ function run_gemc () {
 
 for p in "${particles[@]}"
 do
-    [ -z ${multithread+} ] && args= || args=-m 
-    run_gemc -r $run -g $gemc -n $nevents -c $gcard -i $p.txt -o $p.hipo $args
+    run_gemc -r $run -g $gemc -n $nevents -c $gcard -i $p.txt -o $p.hipo
 done
 [ -z ${multithread+x} ] || wait