Skip to content

Commit

Permalink
Revert "Bump VMC dependent packages: (#4025)" (#4076)
Browse files Browse the repository at this point in the history
This reverts commit a5e888e.

We see SIGNAL11 with G4 and the simulation hangs indefinitely.
This needs to be understood before we can use the new version.

related to https://alice.its.cern.ch/jira/browse/O2-2901
  • Loading branch information
sawenzel authored Apr 19, 2022
1 parent bb1a047 commit c0e1768
Show file tree
Hide file tree
Showing 8 changed files with 11 additions and 11 deletions.
2 changes: 1 addition & 1 deletion fairroot.sh
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
package: FairRoot
version: "%(short_hash)s"
tag: "v18.4.7"
tag: "v18.4.2"
source: https://github.com/FairRootGroup/FairRoot
requires:
- generators
Expand Down
2 changes: 1 addition & 1 deletion fluka_vmc.sh
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
package: FLUKA_VMC
version: "%(tag_basename)s"
tag: "4-1.1-vmc3"
tag: "4-1.1-vmc2"
source: https://gitlab.cern.ch/ALICEPrivateExternals/FLUKA_VMC.git
requires:
- "GCC-Toolchain:(?!osx)"
Expand Down
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"
#source: https://github.com/alisw/geant4.git
source: https://gitlab.cern.ch/geant4/geant4.git
tag: "v10.7.2-alice1"
source: https://github.com/alisw/geant4.git
requires:
- "GCC-Toolchain:(?!osx)"
build_requires:
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 c0e1768

Please sign in to comment.