Skip to content

Commit

Permalink
Reverting VMC and Geant4 to previous version (alisw#4306)
Browse files Browse the repository at this point in the history
Latest G4(_VMC) seems to have a potential issue
with physics processes/cuts leading to an observable reduction
in TPC tracks in our MC processing.

Reverting for now to previous version in order to stabilize situation
and give time to provide and validate fix.
  • Loading branch information
sawenzel authored Jun 18, 2022
1 parent 362915c commit e818f16
Show file tree
Hide file tree
Showing 6 changed files with 9 additions and 9 deletions.
2 changes: 1 addition & 1 deletion geant3.sh
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
package: GEANT3
version: "%(tag_basename)s"
tag: v4-1
tag: v3-9
requires:
- ROOT
- VMC
Expand Down
5 changes: 2 additions & 3 deletions geant4.sh
Original file line number Diff line number Diff line change
@@ -1,8 +1,7 @@
package: GEANT4
version: "%(tag_basename)s"
tag: "v11.0.1-alice1"
tag: "v10.7.2-alice1"
source: https://github.com/alisw/geant4.git
#source: https://gitlab.cern.ch/geant4/geant4.git
requires:
- "GCC-Toolchain:(?!osx)"
build_requires:
Expand All @@ -27,7 +26,6 @@ env:
cmake $SOURCEDIR \
-DGEANT4_INSTALL_DATA_TIMEOUT=2000 \
-DCMAKE_CXX_FLAGS="-fPIC" \
${CXXSTD:+-DCMAKE_CXX_STANDARD="$CXXSTD"} \
-DCMAKE_INSTALL_PREFIX:PATH="$INSTALLROOT" \
-DCMAKE_INSTALL_LIBDIR="lib" \
-DCMAKE_BUILD_TYPE=RelWithDebInfo \
Expand All @@ -44,6 +42,7 @@ cmake $SOURCEDIR \
${GEANT4_DATADIR:+-DGEANT4_INSTALL_DATADIR="$GEANT4_DATADIR"} \
-DGEANT4_USE_SYSTEM_EXPAT=OFF \
${XERCESC_ROOT:+-DXERCESC_ROOT_DIR=$XERCESC_ROOT} \
${CXXSTD:+-DGEANT4_BUILD_CXXSTD=$CXXSTD} \
-DCMAKE_EXPORT_COMPILE_COMMANDS=ON

make ${JOBS+-j $JOBS}
Expand Down
5 changes: 3 additions & 2 deletions geant4_vmc.sh
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
package: GEANT4_VMC
version: "%(tag_basename)s"
tag: "v6-1"
tag: "v5-4"
source: https://github.com/vmc-project/geant4_vmc
requires:
- ROOT
Expand All @@ -11,7 +11,7 @@ build_requires:
- CMake
- "Xcode:(osx.*)"
prepend_path:
ROOT_INCLUDE_PATH: "$GEANT4_VMC_ROOT/include/g4root:$GEANT4_VMC_ROOT/include/geant4vmc"
ROOT_INCLUDE_PATH: "$GEANT4_VMC_ROOT/include/g4root:$GEANT4_VMC_ROOT/include/geant4vmc:$GEANT4_VMC_ROOT/include/mtroot"
env:
G4VMCINSTALL: "$GEANT4_VMC_ROOT"
---
Expand Down Expand Up @@ -49,6 +49,7 @@ setenv G4VMCINSTALL \$GEANT4_VMC_ROOT
setenv GEANT4VMC_MACRO_DIR \$GEANT4_VMC_ROOT/share/examples/macro
setenv USE_VGM 1
prepend-path PATH \$GEANT4_VMC_ROOT/bin
prepend-path ROOT_INCLUDE_PATH \$GEANT4_VMC_ROOT/include/mtroot
prepend-path ROOT_INCLUDE_PATH \$GEANT4_VMC_ROOT/include/geant4vmc
prepend-path ROOT_INCLUDE_PATH \$GEANT4_VMC_ROOT/include/g4root
prepend-path LD_LIBRARY_PATH \$GEANT4_VMC_ROOT/lib
Expand Down
2 changes: 1 addition & 1 deletion mcsteplogger.sh
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
package: MCStepLogger
version: "%(tag_basename)s"
tag: "v0.5.0"
tag: "v0.4.0"
source: https://github.com/AliceO2Group/VMCStepLogger.git
requires:
- "GCC-Toolchain:(?!osx)"
Expand Down
2 changes: 1 addition & 1 deletion vgm.sh
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
package: vgm
version: "%(tag_basename)s"
tag: "v5-0"
tag: "v4-9"
source: https://github.com/vmc-project/vgm
requires:
- ROOT
Expand Down
2 changes: 1 addition & 1 deletion vmc.sh
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
package: VMC
version: "%(tag_basename)s"
tag: "v2-0"
tag: "v1-1-p1"
source: https://github.com/vmc-project/vmc
requires:
- ROOT
Expand Down

0 comments on commit e818f16

Please sign in to comment.