Merge branch 'main' into photontiming_geant4

Author: plexoos

.clang-format

@@ -0,0 +1,12 @@
+BasedOnStyle: Microsoft
+AlignConsecutiveDeclarations:
+  Enabled: true
+  AcrossEmptyLines: false
+  AcrossComments: false
+  AlignFunctionDeclarations: false
+AllowShortLoopsOnASingleLine: true
+BreakConstructorInitializers: AfterColon
+BreakTemplateDeclarations: MultiLine
+ColumnLimit: 0
+PackConstructorInitializers: Never
+PointerAlignment: Left

.devcontainer/devcontainer.json

@@ -12,6 +12,9 @@
       "ghcr.io/bnlnpps/eic-opticks:base"
     ]
   },
+  "features": {
+    "./features/llvm": {}
+  },
   "remoteEnv": {
     "CODEX_HOME": "${containerWorkspaceFolder}/.codex"
   },

.devcontainer/features/llvm/devcontainer-feature.json

@@ -0,0 +1,16 @@
+{
+  "name": "LLVM Toolchain",
+  "id": "llvm",
+  "version": "1.0.0",
+  "description": "Installs LLVM toolchain packages (clang-format, clangd, clang-tidy) from the official LLVM APT repository",
+  "options": {
+    "version": {
+      "type": "string",
+      "default": "latest",
+      "description": "LLVM version to install, e.g. 18, 20, 23, or latest."
+    }
+  },
+  "installsAfter": [
+    "ghcr.io/devcontainers/features/common-utils"
+  ]
+}

.devcontainer/features/llvm/install.sh

@@ -0,0 +1,56 @@
+#!/bin/bash
+set -euo pipefail
+
+# Devcontainer feature option:
+# "version" in devcontainer-feature.json becomes VERSION here.
+LLVM_REQUESTED_VERSION="${VERSION:-latest}"
+
+. /etc/os-release
+
+apt-get update -y
+apt-get install -y --no-install-recommends \
+    ca-certificates \
+    gnupg \
+    wget
+
+install -d -m 0755 /etc/apt/keyrings
+
+wget -qO /etc/apt/keyrings/apt.llvm.org.asc https://apt.llvm.org/llvm-snapshot.gpg.key
+
+# Use the generic apt.llvm.org suite.
+cat > /etc/apt/sources.list.d/llvm.list <<EOF
+deb [signed-by=/etc/apt/keyrings/apt.llvm.org.asc] https://apt.llvm.org/${VERSION_CODENAME}/ llvm-toolchain-${VERSION_CODENAME} main
+EOF
+
+apt-get update -y
+
+if [ "${LLVM_REQUESTED_VERSION}" = "latest" ] || [ -z "${LLVM_REQUESTED_VERSION}" ]; then
+    LLVM_VERSION="$(
+        apt-cache search '^clang-format-[0-9]+$' \
+            | awk '{print $1}' \
+            | sed 's/^clang-format-//' \
+            | sort -V \
+            | tail -n 1
+    )"
+
+    if [ -z "${LLVM_VERSION}" ]; then
+        echo "ERROR: Could not determine latest available LLVM version." >&2
+        exit 1
+    fi
+else
+    LLVM_VERSION="${LLVM_REQUESTED_VERSION}"
+fi
+
+echo "Using LLVM version: ${LLVM_VERSION}"
+
+apt-get install -y --no-install-recommends \
+    clang-format-${LLVM_VERSION} \
+    clangd-${LLVM_VERSION} \
+    clang-tidy-${LLVM_VERSION}
+
+ln -sf /usr/bin/clang-format-${LLVM_VERSION} /usr/local/bin/clang-format
+ln -sf /usr/bin/clangd-${LLVM_VERSION} /usr/local/bin/clangd
+ln -sf /usr/bin/clang-tidy-${LLVM_VERSION} /usr/local/bin/clang-tidy
+
+apt-get clean
+rm -rf /var/lib/apt/lists/*

.github/workflows/build-pull-request.yaml

@@ -29,12 +29,15 @@ jobs:
         env:
           GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
         with:
-          style: microsoft
+          style: file
           ignore: include/argparse
           lines-changed-only: true
           thread-comments: update
-          format-review: true
+          format-review: false
           tidy-checks: '-*'
+          tidy-review: false
+          step-summary: true
+          file-annotations: true
 
       - name: Fail fast?!
         if: steps.linter.outputs.checks-failed != 0

CMakeLists.txt

@@ -11,7 +11,7 @@ if(NOT CMAKE_CONFIGURATION_TYPES AND NOT CMAKE_BUILD_TYPE)
   set(CMAKE_BUILD_TYPE Debug CACHE STRING "Build type")
 endif()
 
-project(eic-opticks VERSION 0.3.0 LANGUAGES CXX CUDA)
+project(eic-opticks VERSION 0.5.0 LANGUAGES CXX CUDA)
 
 set(CMAKE_CXX_STANDARD 17)
 set(CMAKE_CXX_STANDARD_REQUIRED ON)

CSG/CSGCopyTest.sh

@@ -7,6 +7,5 @@ export CSGCopy=INFO
 #export DUMP_NPS=7
 #export DUMP_RIDX=6 
 
-lldb__ CSGCopyTest $* 
-
+gdb__ CSGCopyTest $*