Merge remote-tracking branch 'upstream/master'

smajee · Dec 3, 2020 · 6cbc3fc · 6cbc3fc
2 parents 56a8ff4 + 8f828f0
commit 6cbc3fc
Show file tree

Hide file tree

Showing 9 changed files with 751 additions and 789 deletions.
diff --git a/demo/runDemo.sh b/demo/runDemo.sh
@@ -75,7 +75,6 @@ fi
 # check for matrix file, and compute if not present
 if [[ ! -f "$matName.2Dsvmatrix" ]]; then
    echo "Generating system matrix file: $matName.2Dsvmatrix"
-   echo "Generating projection file: $matName.2Dprojection"
    $execdir/mbir_ct -i $parName -j $parName -m $matName
 else
    echo "System matrix file found: $matName.2Dsvmatrix"

diff --git a/demo/sysmatrix/.gitignore b/demo/sysmatrix/.gitignore
@@ -1,2 +1 @@
 *.2Dsvmatrix
-*.2Dprojection