Updates GitHub Actions Data Workflow to Ubuntu 22.04.

Author: dw96

.github/workflows/data_unit_tests.yml

@@ -9,7 +9,7 @@ env:
 
 jobs:
   build:
-    runs-on: ubuntu-20.04
+    runs-on: ubuntu-22.04
     steps:
     - uses: actions/checkout@v4
       with:
@@ -23,28 +23,28 @@ jobs:
         sudo apt-get install libzmq3-dev libpcap-dev liblog4cxx-dev libblosc-dev libhdf5-dev
     - name: Clone Odin-data
       run: |
-        git clone -b 1.8.0 https://github.com/odin-detector/odin-data.git
+        git clone -b 1.10.1 https://github.com/odin-detector/odin-data.git
     - name: Build odin-data
       run: |
-        cd odin-data
+        cd odin-data/cpp/
         echo "INSTALL_PREFIX is ${INSTALL_PREFIX}"
         mkdir -p $INSTALL_PREFIX
         mkdir build && cd build
         cmake -DCMAKE_INSTALL_PREFIX=$INSTALL_PREFIX ..
         make install VERBOSE=1
       env:
-        MAKEFLAGS: "-j2"
+        MAKEFLAGS: "-j4"
     - name: Run frame receiver unit tests
       env:
         INSTALL_PREFIX: ${{ env.INSTALL_PREFIX }}
       run: |
-        cd odin-data/build
+        cd odin-data/cpp/build
         bin/frameReceiverTest
     - name: Run frame processor unit tests
       env:
         INSTALL_PREFIX: ${{ env.INSTALL_PREFIX }}
       run: |
-        cd odin-data/build
+        cd odin-data/cpp/build
         bin/frameProcessorTest
     - name: Build hexitec-detector 
       run: |
@@ -55,13 +55,13 @@ jobs:
         cmake -DCMAKE_INSTALL_PREFIX=$INSTALL_PREFIX -DODINDATA_ROOT_DIR=$INSTALL_PREFIX ..
         make install VERBOSE=1
       env:
-        MAKEFLAGS: "-j2"
+        MAKEFLAGS: "-j4"
     - name: Run odin-data frame integration test
       env:
         INSTALL_PREFIX: ${{ env.INSTALL_PREFIX }}
       run: |
         echo "INSTALL_PREFIX is ${INSTALL_PREFIX}"
-        cd odin-data/build
+        cd odin-data/cpp/build
         bin/odinDataTest --json=$INSTALL_PREFIX/test_config/hexitec2x6-average.json
         echo "Python version:"
         python --version

data/test/integrationTest/config/hexitec2x2-average.json

@@ -37,12 +37,11 @@
     },
     "receiver":
     {
-        "json_file": "${INSTALL_PREFIX}\/test_config\/hexitec2x2-fr.json",
-        "m": "500000000"
+        "config": "${INSTALL_PREFIX}\/test_config\/hexitec2x2-fr.json"
     },
     "processor":
     {
-        "json_file": "${INSTALL_PREFIX}\/test_config\/hexitec2x2-fp-average.json"
+        "config": "${INSTALL_PREFIX}\/test_config\/hexitec2x2-fp-average.json"
     },
     "test":
     {

data/test/integrationTest/config/hexitec2x6-average.json

@@ -16,7 +16,7 @@
             "process": false,
             "command": "${INSTALL_PREFIX}\/bin\/frameSimulator",
             "pos-args": "Hexitec",
-            "sleep": 1
+            "sleep": 10
         },
         "test": {
             "process": false,
@@ -28,24 +28,27 @@
     "simulator":
     {
         "lib-path": "${INSTALL_PREFIX}\/lib",
-        "frames": "11",
+        "frames": "10",
         "dest-ip": "127.0.0.1",
         "ports": "61649",
         "pattern-path": "${INSTALL_PREFIX}\/test_config\/patterns\/CSD_2x6_average.json",
         "interval": "1",
+        "packet-gap": 10,
     	"sensors_layout": "2x6"
     },
     "receiver":
     {
-        "json_file": "${INSTALL_PREFIX}\/test_config\/hexitec2x6-fr.json",
-        "m": "500000000"
+        "config": "${INSTALL_PREFIX}\/test_config\/hexitec2x6-fr.json",
+        "log-config": "${INSTALL_PREFIX}\/test_config\/fr_log4cxx.xml"
     },
     "processor":
     {
-        "json_file": "${INSTALL_PREFIX}\/test_config\/hexitec2x6-fp-average.json"
+        "config": "${INSTALL_PREFIX}\/test_config\/hexitec2x6-fp-average.json",
+        "log-config": "${INSTALL_PREFIX}\/test_config\/fp_log4cxx.xml"
     },
     "test":
     {
-        "json": "${INSTALL_PREFIX}\/test_config\/test2x6-average.json"
+        "json": "${INSTALL_PREFIX}\/test_config\/test2x6-average.json",
+        "log-config": "${INSTALL_PREFIX}\/test_config\/fs_log4cxx.xml"
     }
 }

data/test/integrationTest/config/hexitec2x6-fp-average.json

@@ -4,7 +4,8 @@
           "fr_ready_cnxn":"tcp://127.0.0.1:5001",
           "fr_release_cnxn":"tcp://127.0.0.1:5002"
       },
-      "meta_endpoint":"tcp://*:5008"
+      "meta_endpoint":"tcp://*:5008",
+      "frames": 10
   },
   {
       "plugin": {

data/test/integrationTest/config/hexitec2x6-fr.json

@@ -1,13 +1,17 @@
 [
   {
-      "decoder_type": "Hexitec",
-      "decoder_path": "${INSTALL_PREFIX}/lib",
-      "rx_ports": "61649",
-      "decoder_config": {
-          "enable_packet_logging": false,
-          "frame_timeout_ms": 1000,
-          "fem_port_map": "61649:0",
+    "frame_ready_endpoint": "tcp://127.0.0.1:5001",
+    "frame_release_endpoint": "tcp://127.0.0.1:5002",
+    "decoder_type": "Hexitec",
+    "decoder_path": "${INSTALL_PREFIX}/lib",
+    "rx_ports": "61649",
+    "max_buffer_mem": 500000000,
+    "decoder_config": {
+        "enable_packet_logging": false,
+        "frame_timeout_ms": 1000,
+        "fem_port_map": "61649:0",
         "sensors_layout": "2x6"
-      }
+    },
+    "frames": 10
   }
 ]