Merge pull request #539 from JeffersonLab/development

preparing production tag for RG-B pass1
JeffersonLab · Jun 10, 2020 · 98dcc68 · 98dcc68
2 parents f24b1aa + 05d4a22
commit 98dcc68
Show file tree

Hide file tree

Showing 87 changed files with 1,959 additions and 981 deletions.
diff --git a/common-tools/clas-analysis/pom.xml b/common-tools/clas-analysis/pom.xml
@@ -3,14 +3,14 @@
   <modelVersion>4.0.0</modelVersion>
   <groupId>org.jlab.clas</groupId>
   <artifactId>clas-analysis</artifactId>
-  <version>6.5.6-SNAPSHOT</version>
+  <version>6.5.8-SNAPSHOT</version>
   <packaging>jar</packaging>
 
   <parent>
     <groupId>org.jlab.clas</groupId>
     <artifactId>clas12rec</artifactId>
     <relativePath>../../parent/pom.xml</relativePath>
-    <version>6.5.6-SNAPSHOT</version>
+    <version>6.5.8-SNAPSHOT</version>
   </parent>
 
   <build>
@@ -30,31 +30,31 @@
     <dependency>
       <groupId>org.jlab.clas</groupId>
       <artifactId>clas-utils</artifactId>
-      <version>6.5.6-SNAPSHOT</version>
+      <version>6.5.8-SNAPSHOT</version>
     </dependency>
 
     <dependency>
       <groupId>org.jlab.clas</groupId>
       <artifactId>clas-physics</artifactId>
-      <version>6.5.6-SNAPSHOT</version>
+      <version>6.5.8-SNAPSHOT</version>
     </dependency>
 
     <dependency>
       <groupId>org.jlab.clas</groupId>
       <artifactId>clas-io</artifactId>
-      <version>6.5.6-SNAPSHOT</version>
+      <version>6.5.8-SNAPSHOT</version>
     </dependency> 
 
     <dependency>
       <groupId>org.jlab.clas</groupId>
       <artifactId>clas-geometry</artifactId>
-      <version>6.5.6-SNAPSHOT</version>
+      <version>6.5.8-SNAPSHOT</version>
     </dependency>
 
     <dependency>
       <groupId>org.jlab.clas</groupId>
       <artifactId>clas-detector</artifactId>
-      <version>6.5.6-SNAPSHOT</version>
+      <version>6.5.8-SNAPSHOT</version>
     </dependency>
 
     <dependency>

diff --git a/common-tools/clas-detector/pom.xml b/common-tools/clas-detector/pom.xml
@@ -3,14 +3,14 @@
   <modelVersion>4.0.0</modelVersion>
   <groupId>org.jlab.clas</groupId>
   <artifactId>clas-detector</artifactId>
-  <version>6.5.6-SNAPSHOT</version>
+  <version>6.5.8-SNAPSHOT</version>
   <packaging>jar</packaging>
 
   <parent>
     <groupId>org.jlab.clas</groupId>
     <artifactId>clas12rec</artifactId>
     <relativePath>../../parent/pom.xml</relativePath>
-    <version>6.5.6-SNAPSHOT</version>
+    <version>6.5.8-SNAPSHOT</version>
   </parent>
 
   <build>
@@ -30,7 +30,7 @@
     <dependency>
       <groupId>org.jlab.clas</groupId>
       <artifactId>clas-utils</artifactId>
-      <version>6.5.6-SNAPSHOT</version>
+      <version>6.5.8-SNAPSHOT</version>
     </dependency>
 
     <dependency>
@@ -42,13 +42,13 @@
     <dependency>
       <groupId>org.jlab.clas</groupId>
       <artifactId>clas-io</artifactId>
-      <version>6.5.6-SNAPSHOT</version>
+      <version>6.5.8-SNAPSHOT</version>
     </dependency> 
 
     <dependency>
       <groupId>org.jlab.clas</groupId>
       <artifactId>clas-geometry</artifactId>
-      <version>6.5.6-SNAPSHOT</version>
+      <version>6.5.8-SNAPSHOT</version>
     </dependency>
 
     <dependency>

diff --git a/common-tools/clas-detector/src/main/java/org/jlab/detector/decode/CLASDecoder4.java b/common-tools/clas-detector/src/main/java/org/jlab/detector/decode/CLASDecoder4.java
@@ -100,49 +100,52 @@ public CodaEventDecoder getCodaEventDecoder() {
     public void initEvent(DataEvent event){
 
         if(event instanceof EvioDataEvent){
-            try {
-
-                dataList = codaDecoder.getDataEntries( (EvioDataEvent) event);
-
-                //dataList = new ArrayList<DetectorDataDgtz>();
-                //-----------------------------------------------------------------------------
-                // This part reads the BITPACKED FADC data from tag=57638 Format (cmcms)
-                // Then unpacks into Detector Digigitized data, and appends to existing buffer
-                // Modified on 9/5/2018
-                //-----------------------------------------------------------------------------
-
-                List<FADCData>  fadcPacked = codaDecoder.getADCEntries((EvioDataEvent) event);
-
-                /*for(FADCData data : fadcPacked){
+            EvioDataEvent evioEvent = (EvioDataEvent) event;
+            if(evioEvent.getHandler().getStructure()!=null){
+                try {
+
+                    dataList = codaDecoder.getDataEntries( (EvioDataEvent) event);
+
+                    //dataList = new ArrayList<DetectorDataDgtz>();
+                    //-----------------------------------------------------------------------------
+                    // This part reads the BITPACKED FADC data from tag=57638 Format (cmcms)
+                    // Then unpacks into Detector Digigitized data, and appends to existing buffer
+                    // Modified on 9/5/2018
+                    //-----------------------------------------------------------------------------
+
+                    List<FADCData>  fadcPacked = codaDecoder.getADCEntries((EvioDataEvent) event);
+
+                    /*for(FADCData data : fadcPacked){
                     data.show();
-                }*/
-
-                if(fadcPacked!=null){
-                    List<DetectorDataDgtz> fadcUnpacked = FADCData.convert(fadcPacked);
-                    dataList.addAll(fadcUnpacked);
-                }
-                //  END of Bitpacked section
-                //-----------------------------------------------------------------------------
-                //this.decoderDebugMode = 4;
-                if(this.decoderDebugMode>0){
-                    System.out.println("\n>>>>>>>>> RAW decoded data");
-                    for(DetectorDataDgtz data : dataList){
-                        System.out.println(data);
+                    }*/
+
+                    if(fadcPacked!=null){
+                        List<DetectorDataDgtz> fadcUnpacked = FADCData.convert(fadcPacked);
+                        dataList.addAll(fadcUnpacked);
                     }
-                }
-                int runNumberCoda = codaDecoder.getRunNumber();
-                this.setRunNumber(runNumberCoda);
-
-                detectorDecoder.translate(dataList);
-                detectorDecoder.fitPulses(dataList);
-                if(this.decoderDebugMode>0){
-                    System.out.println("\n>>>>>>>>> TRANSLATED data");
-                    for(DetectorDataDgtz data : dataList){
-                        System.out.println(data);
+                    //  END of Bitpacked section
+                    //-----------------------------------------------------------------------------
+                    //this.decoderDebugMode = 4;
+                    if(this.decoderDebugMode>0){
+                        System.out.println("\n>>>>>>>>> RAW decoded data");
+                        for(DetectorDataDgtz data : dataList){
+                            System.out.println(data);
+                        }
+                    }
+                    int runNumberCoda = codaDecoder.getRunNumber();
+                    this.setRunNumber(runNumberCoda);
+
+                    detectorDecoder.translate(dataList);
+                    detectorDecoder.fitPulses(dataList);
+                    if(this.decoderDebugMode>0){
+                        System.out.println("\n>>>>>>>>> TRANSLATED data");
+                        for(DetectorDataDgtz data : dataList){
+                            System.out.println(data);
+                        }
                     }
+                } catch (Exception e) {
+                    e.printStackTrace();
                 }
-            } catch (Exception e) {
-                e.printStackTrace();
             }
         }
 

diff --git a/common-tools/clas-detector/src/main/java/org/jlab/detector/decode/CodaEventDecoder.java b/common-tools/clas-detector/src/main/java/org/jlab/detector/decode/CodaEventDecoder.java
@@ -60,6 +60,13 @@ public CodaEventDecoder(){
      * @return
      */
     public List<DetectorDataDgtz> getDataEntries(EvioDataEvent event){
+
+        int event_size = event.getHandler().getStructure().getByteBuffer().array().length;
+        if(event_size>600*1024){
+            System.out.println("error: >>>> EVENT SIZE EXCEEDS 600 kB");
+            return new ArrayList<DetectorDataDgtz>();
+        }
+
         List<DetectorDataDgtz>  rawEntries = new ArrayList<DetectorDataDgtz>();
         List<EvioTreeBranch> branches = this.getEventBranches(event);
         for(EvioTreeBranch branch : branches){

diff --git a/common-tools/clas-eventmerger/pom.xml b/common-tools/clas-eventmerger/pom.xml
@@ -2,14 +2,14 @@
 <project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
     <modelVersion>4.0.0</modelVersion>
     <artifactId>clas-eventmerger</artifactId>
-      <version>6.5.6-SNAPSHOT</version>
+      <version>6.5.8-SNAPSHOT</version>
   <packaging>jar</packaging>
 
   <parent>
     <groupId>org.jlab.clas</groupId>
     <artifactId>clas12rec</artifactId>
     <relativePath>../../parent/pom.xml</relativePath>
-    <version>6.5.6-SNAPSHOT</version>
+    <version>6.5.8-SNAPSHOT</version>
   </parent>
 
   <build>
@@ -29,19 +29,19 @@
     <dependency>
       <groupId>org.jlab.clas</groupId>
       <artifactId>clas-utils</artifactId>
-      <version>6.5.6-SNAPSHOT</version>
+      <version>6.5.8-SNAPSHOT</version>
     </dependency>
 
     <dependency>
       <groupId>org.jlab.clas</groupId>
       <artifactId>clas-io</artifactId>
-      <version>6.5.6-SNAPSHOT</version>
+      <version>6.5.8-SNAPSHOT</version>
     </dependency> 
 
     <dependency>
       <groupId>org.jlab.clas</groupId>
       <artifactId>clas-geometry</artifactId>
-      <version>6.5.6-SNAPSHOT</version>
+      <version>6.5.8-SNAPSHOT</version>
     </dependency>
 
     <dependency>

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

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>6.5.6-SNAPSHOT</version>
+  <version>6.5.8-SNAPSHOT</version>
   <packaging>jar</packaging>
 
   <parent>
     <groupId>org.jlab.clas</groupId>
     <artifactId>clas12rec</artifactId>
     <relativePath>../../parent/pom.xml</relativePath>
-    <version>6.5.6-SNAPSHOT</version>
+    <version>6.5.8-SNAPSHOT</version>
   </parent>
 
   <build>
@@ -75,7 +75,7 @@
     <dependency>
       <groupId>org.jlab.clas</groupId>
       <artifactId>clas-utils</artifactId>
-      <version>6.5.6-SNAPSHOT</version>
+      <version>6.5.8-SNAPSHOT</version>
     </dependency>
   </dependencies>
 

diff --git a/common-tools/clas-io/src/main/java/org/jlab/io/evio/EvioDataEventHandler.java b/common-tools/clas-io/src/main/java/org/jlab/io/evio/EvioDataEventHandler.java
@@ -30,12 +30,18 @@ public class EvioDataEventHandler {
     public EvioDataEventHandler(byte[] buffer, ByteOrder b_order){
         evioBuffer = ByteBuffer.wrap(buffer);
         evioBuffer.order(b_order);
-         try {
-            structure = new EvioCompactStructureHandler(evioBuffer,DataType.BANK);
-            //eventNodes = structure.getChildNodes();
-            eventNodes = structure.getNodes();
-        } catch (EvioException ex) {
-            Logger.getLogger(EvioDataEvent.class.getName()).log(Level.SEVERE, null, ex);
+        if(buffer.length>500*1024){
+            System.out.println("error >>> evio event hadler : buffer size ecceeds 500 kB");
+            structure = null;
+            eventNodes = null;
+        } else {
+            try {
+                structure = new EvioCompactStructureHandler(evioBuffer,DataType.BANK);
+                //eventNodes = structure.getChildNodes();
+                eventNodes = structure.getNodes();
+            } catch (EvioException ex) {
+                Logger.getLogger(EvioDataEvent.class.getName()).log(Level.SEVERE, null, ex);
+            }
         }
          //this.list();
     }

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>6.5.6-SNAPSHOT</version>
+  <version>6.5.8-SNAPSHOT</version>
   <packaging>jar</packaging>
 
   <parent>
     <groupId>org.jlab.clas</groupId>
     <artifactId>clas12rec</artifactId>
     <relativePath>../../parent/pom.xml</relativePath>
-    <version>6.5.6-SNAPSHOT</version>
+    <version>6.5.8-SNAPSHOT</version>
   </parent>
 
   <build>
@@ -40,12 +40,12 @@
     <dependency>
       <groupId>org.jlab.clas</groupId>
       <artifactId>clas-geometry</artifactId>
-      <version>6.5.6-SNAPSHOT</version>
+      <version>6.5.8-SNAPSHOT</version>
     </dependency>
     <dependency>
       <groupId>org.jlab.clas</groupId>
       <artifactId>clas-detector</artifactId>
-      <version>6.5.6-SNAPSHOT</version>
+      <version>6.5.8-SNAPSHOT</version>
     </dependency>
     <dependency>
       <groupId>java3d</groupId>

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

diff --git a/common-tools/clas-physics/pom.xml b/common-tools/clas-physics/pom.xml
@@ -4,7 +4,7 @@
 
   <groupId>org.jlab.clas</groupId>
   <artifactId>clas-physics</artifactId>
-  <version>6.5.6-SNAPSHOT</version>
+  <version>6.5.8-SNAPSHOT</version>
   <packaging>jar</packaging>
      <build>
          <plugins>
@@ -23,7 +23,7 @@
     <groupId>org.jlab.clas</groupId>
     <artifactId>clas12rec</artifactId>
     <relativePath>../../parent/pom.xml</relativePath>
-    <version>6.5.6-SNAPSHOT</version>
+    <version>6.5.8-SNAPSHOT</version>
   </parent>
 
 </project>