Merge pull request #57 from JeffersonLab/versionBumpAndFixes

fixed HipoDiff warning and bumped version
JeffersonLab · Jun 23, 2023 · 23e70af · 23e70af
2 parents d67b442 + 3f85e93
commit 23e70af
Show file tree

Hide file tree

Showing 43 changed files with 140 additions and 136 deletions.
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.0.0-SNAPSHOT</version>
+  <version>10.0.1-SNAPSHOT</version>
   <packaging>jar</packaging>
 
   <parent>
     <groupId>org.jlab.clas</groupId>
     <artifactId>clas12rec</artifactId>
     <relativePath>../../parent/pom.xml</relativePath>
-    <version>10.0.0-SNAPSHOT</version>
+    <version>10.0.1-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.0.0-SNAPSHOT</version>
+  <version>10.0.1-SNAPSHOT</version>
   <packaging>jar</packaging>
 
   <parent>
     <groupId>org.jlab.clas</groupId>
     <artifactId>clas12rec</artifactId>
     <relativePath>../../parent/pom.xml</relativePath>
-    <version>10.0.0-SNAPSHOT</version>
+    <version>10.0.1-SNAPSHOT</version>
   </parent>
 
   <dependencies>
     <dependency>
       <groupId>org.jlab.clas</groupId>
       <artifactId>clas-utils</artifactId>
-      <version>10.0.0-SNAPSHOT</version>
+      <version>10.0.1-SNAPSHOT</version>
     </dependency>
 
     <dependency>
       <groupId>org.jlab.clas</groupId>
       <artifactId>clas-physics</artifactId>
-      <version>10.0.0-SNAPSHOT</version>
+      <version>10.0.1-SNAPSHOT</version>
     </dependency>
 
     <dependency>
       <groupId>org.jlab.clas</groupId>
       <artifactId>clas-io</artifactId>
-      <version>10.0.0-SNAPSHOT</version>
+      <version>10.0.1-SNAPSHOT</version>
     </dependency> 
 
     <dependency>
       <groupId>org.jlab.clas</groupId>
       <artifactId>clas-geometry</artifactId>
-      <version>10.0.0-SNAPSHOT</version>
+      <version>10.0.1-SNAPSHOT</version>
     </dependency>
 
     <dependency>
       <groupId>org.jlab.clas</groupId>
       <artifactId>clas-jcsg</artifactId>
-      <version>10.0.0-SNAPSHOT</version>
+      <version>10.0.1-SNAPSHOT</version>
     </dependency>
 
     <dependency>
       <groupId>org.jlab.clas</groupId>
       <artifactId>swim-tools</artifactId>
-      <version>10.0.0-SNAPSHOT</version>
+      <version>10.0.1-SNAPSHOT</version>
     </dependency>
 
     <dependency>
       <groupId>org.jlab.clas</groupId>
       <artifactId>clas-detector</artifactId>
-      <version>10.0.0-SNAPSHOT</version>
+      <version>10.0.1-SNAPSHOT</version>
     </dependency>
 
     <dependency>
       <groupId>org.jlab.clas</groupId>
       <artifactId>clas-reco</artifactId>
-      <version>10.0.0-SNAPSHOT</version>
+      <version>10.0.1-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.0.0-SNAPSHOT</version>
+  <version>10.0.1-SNAPSHOT</version>
   <packaging>jar</packaging>
 
   <parent>
     <groupId>org.jlab.clas</groupId>
     <artifactId>clas12rec</artifactId>
     <relativePath>../../parent/pom.xml</relativePath>
-    <version>10.0.0-SNAPSHOT</version>
+    <version>10.0.1-SNAPSHOT</version>
   </parent>
 
   <dependencies>
     <dependency>
       <groupId>org.jlab.clas</groupId>
       <artifactId>clas-utils</artifactId>
-      <version>10.0.0-SNAPSHOT</version>
+      <version>10.0.1-SNAPSHOT</version>
     </dependency>
 
     <dependency>
@@ -29,13 +29,13 @@
     <dependency>
       <groupId>org.jlab.clas</groupId>
       <artifactId>clas-io</artifactId>
-      <version>10.0.0-SNAPSHOT</version>
+      <version>10.0.1-SNAPSHOT</version>
     </dependency> 
 
     <dependency>
       <groupId>org.jlab.clas</groupId>
       <artifactId>clas-geometry</artifactId>
-      <version>10.0.0-SNAPSHOT</version>
+      <version>10.0.1-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>10.0.0-SNAPSHOT</version>
+  <version>10.0.1-SNAPSHOT</version>
   <packaging>jar</packaging>
 
   <parent>
     <groupId>org.jlab.clas</groupId>
     <artifactId>clas12rec</artifactId>
     <relativePath>../../parent/pom.xml</relativePath>
-    <version>10.0.0-SNAPSHOT</version>
+    <version>10.0.1-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>10.0.0-SNAPSHOT</version>
+  <version>10.0.1-SNAPSHOT</version>
   <packaging>jar</packaging>
 
   <parent>
     <groupId>org.jlab.clas</groupId>
     <artifactId>clas12rec</artifactId>
     <relativePath>../../parent/pom.xml</relativePath>
-    <version>10.0.0-SNAPSHOT</version>
+    <version>10.0.1-SNAPSHOT</version>
   </parent>
 
   <dependencies>
@@ -87,13 +87,13 @@
     <dependency>
       <groupId>org.jlab.clas</groupId>
       <artifactId>clas-utils</artifactId>
-      <version>10.0.0-SNAPSHOT</version>
+      <version>10.0.1-SNAPSHOT</version>
     </dependency>
 
     <dependency>
         <groupId>org.jlab.clas</groupId>
         <artifactId>clas-logging</artifactId>
-        <version>10.0.0-SNAPSHOT</version>
+        <version>10.0.1-SNAPSHOT</version>
         <scope>compile</scope>
     </dependency>
 

diff --git a/common-tools/clas-io/src/main/java/org/jlab/utils/HipoDiff.java b/common-tools/clas-io/src/main/java/org/jlab/utils/HipoDiff.java
@@ -77,37 +77,41 @@ public static void main(String args[]) {
                         final int type = schema.getType(j);
                         final String name = schema.getElementName(j);
                         int element = -1;
+                        String values = "";
                         nentry++;
                         switch (type) {
                             case 1:
                                 if (bankA.getByte(name, i) != bankB.getByte(name, i)) {
                                     element = j;
+                                    values += bankA.getByte(name, i) + "/" + bankB.getByte(name, i);
                                 }
                                 break;
                             case 2:
                                 if (bankA.getShort(name, i) != bankB.getShort(name, i)) {
                                     element = j;
+                                    values += bankA.getShort(name, i) + "/" + bankB.getShort(name, i);
                                 }
                                 break;
                             case 3:
                                 if (bankA.getInt(name, i) != bankB.getInt(name, i)) {
                                     element = j;
+                                    values += bankA.getInt(name, i) + "/" + bankB.getInt(name, i);
                                 }
                                 break;
                             case 4:
                                 if ((!Double.isNaN(bankA.getFloat(name, i)) || !Double.isNaN(bankB.getFloat(name, i)))
                                         && (!Double.isInfinite(bankA.getFloat(name, i)) || !Double.isInfinite(bankB.getFloat(name, i)))
                                         && Math.abs(bankA.getFloat(name, i) - bankB.getFloat(name, i)) > tolerance) {
                                     element = j;
+                                    values += bankA.getFloat(name, i) + "/" + bankB.getFloat(name, i);
                                 }
                                 break;
                         }
                         if (element >= 0) {
                             System.out.println("mismatch at event " + runConfigBank.getInt("event", 0)
-                                    + ", in row " + i + ", s/l/c " + bankA.getByte("sector", i) + "/"
-                                    + bankA.getByte("layer", i) + "/" + bankA.getShort("component", i)
-                                    + " for variable " + name + " with values " + bankA.getByte(name, i) + "/"
-                                    + bankB.getByte(name, i));
+                                    + " in row " + i 
+                                    + " for variable " + name 
+                                    + " with values "  + values);
                             mismatch = true;
                             nbadentry++;
                             if (badEntries.containsKey(schema.getElementName(element))) {
@@ -124,7 +128,7 @@ public static void main(String args[]) {
                 }
             }
         }
-        System.out.println("Analyzed " + nevent + " with " + nbadevent + " bad banks");
+        System.out.println("\n Analyzed " + nevent + " with " + nbadevent + " bad banks");
         System.out.println(nbadrow + "/" + nrow + " mismatched rows");
         System.out.println(nbadentry + "/" + nentry + " mismatched entry");
         for (String name : badEntries.keySet()) {

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>10.0.0-SNAPSHOT</version>
+  <version>10.0.1-SNAPSHOT</version>
   <packaging>jar</packaging>
 
   <parent>
     <groupId>org.jlab.clas</groupId>
     <artifactId>clas12rec</artifactId>
     <relativePath>../../parent/pom.xml</relativePath>
-    <version>10.0.0-SNAPSHOT</version>
+    <version>10.0.1-SNAPSHOT</version>
   </parent>
 
   <dependencies>
@@ -27,12 +27,12 @@
     <dependency>
       <groupId>org.jlab.clas</groupId>
       <artifactId>clas-geometry</artifactId>
-      <version>10.0.0-SNAPSHOT</version>
+      <version>10.0.1-SNAPSHOT</version>
     </dependency>
     <dependency>
       <groupId>org.jlab.clas</groupId>
       <artifactId>clas-detector</artifactId>
-      <version>10.0.0-SNAPSHOT</version>
+      <version>10.0.1-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>10.0.0-SNAPSHOT</version>
+  <version>10.0.1-SNAPSHOT</version>
   <packaging>jar</packaging>
 
   <parent>
     <groupId>org.jlab.clas</groupId>
     <artifactId>clas12rec</artifactId>
     <relativePath>../../parent/pom.xml</relativePath>
-    <version>10.0.0-SNAPSHOT</version>
+    <version>10.0.1-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>10.0.0-SNAPSHOT</version>
+  <version>10.0.1-SNAPSHOT</version>
   <packaging>jar</packaging>
 
   <parent>
     <groupId>org.jlab.clas</groupId>
     <artifactId>clas12rec</artifactId>
     <relativePath>../../parent/pom.xml</relativePath>
-    <version>10.0.0-SNAPSHOT</version>
+    <version>10.0.1-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>10.0.0-SNAPSHOT</version>
+  <version>10.0.1-SNAPSHOT</version>
   <packaging>jar</packaging>
 
   <parent>
     <groupId>org.jlab.clas</groupId>
     <artifactId>clas12rec</artifactId>
     <relativePath>../../parent/pom.xml</relativePath>
-    <version>10.0.0-SNAPSHOT</version>
+    <version>10.0.1-SNAPSHOT</version>
   </parent>
 
 </project>
diff --git a/common-tools/clas-reco/pom.xml b/common-tools/clas-reco/pom.xml
@@ -3,14 +3,14 @@
   <modelVersion>4.0.0</modelVersion>
   <groupId>org.jlab.clas</groupId>
   <artifactId>clas-reco</artifactId>
-  <version>10.0.0-SNAPSHOT</version>
+  <version>10.0.1-SNAPSHOT</version>
   <packaging>jar</packaging>
 
   <parent>
     <groupId>org.jlab.clas</groupId>
     <artifactId>clas12rec</artifactId>
     <relativePath>../../parent/pom.xml</relativePath>
-    <version>10.0.0-SNAPSHOT</version>
+    <version>10.0.1-SNAPSHOT</version>
   </parent>
 
   <dependencies>
@@ -42,37 +42,37 @@
     <dependency>
       <groupId>org.jlab.clas</groupId>
       <artifactId>clas-math</artifactId>
-      <version>10.0.0-SNAPSHOT</version>
+      <version>10.0.1-SNAPSHOT</version>
     </dependency>
 
     <dependency>
       <groupId>org.jlab.clas</groupId>
       <artifactId>clas-io</artifactId>
-      <version>10.0.0-SNAPSHOT</version>
+      <version>10.0.1-SNAPSHOT</version>
     </dependency>
 
     <dependency>
       <groupId>org.jlab.clas</groupId>
       <artifactId>clas-logging</artifactId>
-      <version>10.0.0-SNAPSHOT</version>
+      <version>10.0.1-SNAPSHOT</version>
     </dependency>
 
     <dependency>
       <groupId>org.jlab.clas</groupId>
       <artifactId>clas-physics</artifactId>
-      <version>10.0.0-SNAPSHOT</version>
+      <version>10.0.1-SNAPSHOT</version>
     </dependency>
 
     <dependency>
       <groupId>org.jlab.clas</groupId>
       <artifactId>clas-utils</artifactId>
-      <version>10.0.0-SNAPSHOT</version>
+      <version>10.0.1-SNAPSHOT</version>
     </dependency>
 
     <dependency>
       <groupId>org.jlab.clas</groupId>
       <artifactId>clas-detector</artifactId>
-      <version>10.0.0-SNAPSHOT</version>
+      <version>10.0.1-SNAPSHOT</version>
     </dependency>
 
   </dependencies>