Merge pull request #304 from NikEfth/tof_sino_UCL

Time Of Flight reconstruction

.gitattributes

@@ -12,6 +12,8 @@
 *.v     -text -diff
 *.s     -text -diff
 *.scn     -text -diff
+*.l     -text -diff
+*.root  -text -diff
 *.gz     -text -diff
 *.nii     -text -diff
 *.sh    eol=lf

.github/workflows/GHA_increase_disk_space.sh

@@ -0,0 +1,23 @@
+#!/bin/bash
+df -h
+# locations from the internet, e.g. https://github.com/easimon/maximize-build-space
+# saves about 2GB
+if [ -d /usr/share/dotnet ]; then
+    echo removing dotnet
+    sudo rm -rf /usr/share/dotnet
+fi
+# saves about 10 GB
+if [ -d "$AGENT_TOOLSDIRECTORY" ]; then
+    echo removing agent_tools
+    sudo rm -rf "$AGENT_TOOLSDIRECTORY"
+fi
+# saves about 10 GB
+if [ -d /usr/local/lib/android ]; then
+    echo removing android files
+    sudo rm -rf /usr/local/lib/android
+fi
+if [ -d /opt/ghc ]; then
+    echo removing android files
+    sudo rm -rf /opt/ghc
+fi
+df -h

.github/workflows/build-test.yml

@@ -2,7 +2,9 @@ name: Build and ctest and recon_test_pack CI
 
 on:
   push:
-    branches: [ master ]
+    branches: 
+      - master
+      - tof_sino_UCL
     paths-ignore:
       - '.appveyor.yml'
       - 'CITATION.cff'
@@ -12,7 +14,9 @@ on:
       - '**/*.tex'
 
   pull_request:
-    branches: [ master ]
+    branches:
+      - master
+      - tof_sino_UCL
     paths-ignore:
       - '.appveyor.yml'
       - 'CITATION.cff'
@@ -116,6 +120,18 @@ jobs:
       with:
         submodules: recursive
 
+    - name: disk space
+      shell: bash
+      run: |
+          case ${{matrix.os}} in
+            (ubuntu* | macOS*)
+              sudo .github/workflows/GHA_increase_disk_space.sh
+              ;;
+            (windows*)
+              # no idea what to do here
+              ;;
+           esac
+
     - name: set_compiler_variables
       shell: bash
       run: |
@@ -331,14 +347,17 @@ jobs:
       if: failure()
       with:
         name: recon_test_pack_log_files-${{ matrix.os }}-${{ matrix.compiler }}${{ matrix.compiler_version }}-${{ matrix.BUILD_TYPE }}-pp=${{ matrix.parallelproj }}-ROOT=${{ matrix.ROOT }}
-        path: ${{ github.workspace }}/recon_test_pack/**/*.log
+        path: |
+          ${{ github.workspace }}/recon_test_pack/**/*.log
+          ${{ github.workspace }}/recon_test_pack/**/my_*v
+          ${{ github.workspace }}/recon_test_pack/**/my_*s
         retention-days: 7
 
     # Enable tmate debugging of manually-triggered workflows if the input option was provided
     - name: Setup tmate session if triggered
       uses: mxschmitt/action-tmate@v3
       timeout-minutes: 15
-      if: ${{ github.event_name == 'workflow_dispatch' && github.event.inputs.debug_enabled }}
+      if: ${{ github.event_name == 'workflow_dispatch' && inputs.debug_enabled == 'true' }}
 
     - name: examples
       shell: bash

.gitignore

@@ -94,6 +94,6 @@ install/
 examples/ROOT_files/ROOT_STIR_consistency/Gate_macros/main_GATE_macro_test*.mac
 examples/ROOT_files/ROOT_STIR_consistency/pretest_output/root_data_test*.root
 examples/ROOT_files/ROOT_STIR_consistency/pretest_output/root_header_test*.hroot
-examples/ROOT_files/ROOT_STIR_consistency/pretest_output/root_header_test*_lor_pos.txt
+examples/ROOT_files/ROOT_STIR_consistency/*voxel_data_*.*
 examples/ROOT_files/ROOT_STIR_consistency/pretest_output/stir_image*.*
 

CMakeLists.txt

@@ -55,10 +55,10 @@ else()
 endif()
 
 ####### Set Version number etc
-set(VERSION_MAJOR   5)
-set(VERSION_MINOR   2)
+set(VERSION_MAJOR   6)
+set(VERSION_MINOR   0)
 set(VERSION_PATCH   0)
-set(VERSION   050200) # only used in STIRConfig.h.in
+set(VERSION   060000) # only used in STIRConfig.h.in and swig/CMakeLists.txt
 
 set(STIR_VERSION
   ${VERSION_MAJOR}.${VERSION_MINOR}.${VERSION_PATCH})

VERSION.txt

@@ -1 +1 @@
-5.2.0
+6.0.0-pre