Merge branch 'master' into master

AIDASoft · Jul 22, 2024 · 9bafcef · 9bafcef
2 parents 7cb23cf + 63833b3
commit 9bafcef
Show file tree

Hide file tree

Showing 3 changed files with 4 additions and 8 deletions.
diff --git a/.github/workflows/linux.yml b/.github/workflows/linux.yml
@@ -118,7 +118,7 @@ jobs:
     - uses: cvmfs-contrib/github-action-cvmfs@v4
     - uses: aidasoft/run-lcg-view@v3
       with:
-        container: centos7
+        container: el9
         view-path: ${{ matrix.view-path }}
         run: |
           mkdir build
@@ -138,7 +138,7 @@ jobs:
             -DDD4HEP_USE_XERCESC=ON \
             -DCMAKE_BUILD_TYPE=Release \
             -DCMAKE_CXX_FLAGS="-fdiagnostics-color=always"  \
-            -DCMAKE_CXX_STANDARD=17 ..
+            -DCMAKE_CXX_STANDARD=20 ..
           echo "::group::Compile"
           ninja install
           . ../bin/thisdd4hep.sh
@@ -151,7 +151,7 @@ jobs:
           cmake -GNinja \
             -DBoost_NO_BOOST_CMAKE=ON \
             -DDD4HEP_USE_XERCESC=ON \
-            -DCMAKE_CXX_STANDARD=17 ..
+            -DCMAKE_CXX_STANDARD=20 ..
           echo "::group::CompileExamples"
           ninja install
           echo "::group::TestExamples"

diff --git a/.github/workflows/python.yml b/.github/workflows/python.yml
@@ -7,7 +7,7 @@ jobs:
     runs-on: ubuntu-latest
     strategy:
       matrix:
-        LCG: ["dev4/x86_64-centos7-gcc11-opt"]
+        LCG: ["dev4/x86_64-el9-gcc13-opt"]
     steps:
     - uses: actions/checkout@v4
     - uses: cvmfs-contrib/github-action-cvmfs@v4

diff --git a/DDG4/python/DDG4.py b/DDG4/python/DDG4.py
@@ -681,8 +681,6 @@ def setupCalorimeter(self, name, type=None, collections=None):  # noqa: A002
     # sd.setType('calorimeter')
     if typ is None:
       typ = self.sensitive_types['calorimeter']
-    elif typ is not None and self.sensitive_types.get(typ):
-      typ = self.sensitive_types[typ]
     return self.setupDetector(name, typ, collections)
 
   def setupTracker(self, name, type=None, collections=None):  # noqa: A002
@@ -696,8 +694,6 @@ def setupTracker(self, name, type=None, collections=None):  # noqa: A002
     # sd.setType('tracker')
     if typ is None:
       typ = self.sensitive_types['tracker']
-    elif typ is not None and self.sensitive_types.get(typ):
-      typ = self.sensitive_types[typ]
     return self.setupDetector(name, typ, collections)
 
   def _private_setupField(self, field, stepper, equation, prt):