Skip to content
This repository has been archived by the owner on Sep 26, 2019. It is now read-only.

Commit

Permalink
Fix FairRoot and O2 sim setup (alisw#495, alisw#508, alisw#511)
Browse files Browse the repository at this point in the history
- Add module_old to cmake module path in O2
- Add missing G4 data files
- Add missing variables for simulation with FairRoot
- Fix wrong case for GEANT3 and GEANT4
- Add missing VMCWORKDIR for O2
  • Loading branch information
Giulio Eulisse authored and Dario Berzano committed Aug 29, 2016
1 parent 923fe84 commit 9d6f22c
Show file tree
Hide file tree
Showing 4 changed files with 17 additions and 8 deletions.
5 changes: 4 additions & 1 deletion fairroot.sh
Original file line number Diff line number Diff line change
Expand Up @@ -69,9 +69,12 @@ proc ModulesHelp { } {
set version $PKGVERSION-@@PKGREVISION@$PKGHASH@@
module-whatis "ALICE Modulefile for $PKGNAME $PKGVERSION-@@PKGREVISION@$PKGHASH@@"
# Dependencies
module load BASE/1.0 ${BOOST_VERSION:+boost/$BOOST_VERSION-$BOOST_REVISION} ROOT/$ROOT_VERSION-$ROOT_REVISION ${ZEROMQ_VERSION:+ZeroMQ/$ZEROMQ_VERSION-$ZEROMQ_REVISION} ${DDS_ROOT:+DDS/$DDS_VERSION-$DDS_REVISION} ${GCC_TOOLCHAIN_ROOT:+GCC-Toolchain/$GCC_TOOLCHAIN_VERSION-$GCC_TOOLCHAIN_REVISION}
module load BASE/1.0 ${GEANT3_VERSION:+GEANT3/$GEANT3_VERSION-$GEANT3_REVISION} ${GEANT4_VERSION:+GEANT4/$GEANT4_VERSION-$GEANT4_REVISION} ${PROTOBUF_VERSION:+protobuf/$PROTOBUF_VERSION-$PROTOBUF_REVISION} ${PYTHIA6_VERSION:+Pythia6/$PYTHIA6_VERSION-$PYTHIA6_REVISION} ${PYTHIA_VERSION:+Pythia/$PYTHIA_VERSION-$PYTHIA_REVISION} ${GEANT4_VMC_VERSION:+GEANT4_VMC/$GEANT4_VMC_VERSION-$GEANT4_VMC_REVISION} ${VGM_VERSION:+vgm/$VGM_VERSION-$VGM_REVISION} ${BOOST_VERSION:+boost/$BOOST_VERSION-$BOOST_REVISION} ROOT/$ROOT_VERSION-$ROOT_REVISION ${ZEROMQ_VERSION:+ZeroMQ/$ZEROMQ_VERSION-$ZEROMQ_REVISION} ${DDS_ROOT:+DDS/$DDS_VERSION-$DDS_REVISION} ${GCC_TOOLCHAIN_ROOT:+GCC-Toolchain/$GCC_TOOLCHAIN_VERSION-$GCC_TOOLCHAIN_REVISION}
# Our environment
setenv FAIRROOT_ROOT \$::env(BASEDIR)/$PKGNAME/\$version
setenv VMCWORKDIR \$::env(FAIRROOT_ROOT)/share/fairbase/examples
setenv GEOMPATH \$::env(VMCWORKDIR)/common/geometry
setenv CONFIG_DIR \$::env(VMCWORKDIR)/common/gconfig
prepend-path LD_LIBRARY_PATH \$::env(FAIRROOT_ROOT)/lib
$([[ ${ARCHITECTURE:0:3} == osx ]] && echo "prepend-path DYLD_LIBRARY_PATH \$::env(FAIRROOT_ROOT)/lib")
EoF
1 change: 1 addition & 0 deletions geant3.sh
Original file line number Diff line number Diff line change
Expand Up @@ -37,6 +37,7 @@ module load BASE/1.0 ROOT/$ROOT_VERSION-$ROOT_REVISION
# Our environment
setenv GEANT3_ROOT \$::env(BASEDIR)/$PKGNAME/\$version
setenv GEANT3DIR \$::env(GEANT3_ROOT)
setenv G3SYS \$::env(GEANT3_ROOT)
prepend-path PATH \$::env(GEANT3_ROOT)/bin
prepend-path LD_LIBRARY_PATH \$::env(GEANT3_ROOT)/lib64
$([[ ${ARCHITECTURE:0:3} == osx ]] && echo "prepend-path DYLD_LIBRARY_PATH \$::env(GEANT3_ROOT)/lib64")
Expand Down
16 changes: 10 additions & 6 deletions geant4.sh
Original file line number Diff line number Diff line change
Expand Up @@ -10,12 +10,16 @@ env:
G4INSTALL: "$GEANT4_ROOT"
G4INSTALL_DATA: "$GEANT4_ROOT/share/Geant4-10.1.3"
G4SYSTEM: "$(uname)-g++"
G4LEVELGAMMADATA: "$GEANT4_ROOT/share/Geant4-10.1.3/data/PhotonEvaporation3.1"
G4RADIOACTIVEDATA: "$GEANT4_ROOT/share/Geant4-10.1.3/data/RadioactiveDecay4.2"
G4LEDATA: "$GEANT4_ROOT/share/Geant4-10.1.3/data/G4EMLOW6.41"
G4NEUTRONHPDATA: "$GEANT4_ROOT/share/Geant4-10.1.3/data/G4NDL4.5"
G4NEUTRONXSDATA: "$GEANT4_ROOT/share/Geant4-10.1.3/data/G4NEUTRONXS1.4"
G4SAIDXSDATA: "$GEANT4_ROOT/share/Geant4-10.1.3/data/G4SAIDDATA1.1"
G4LEVELGAMMADATA: "$GEANT4_ROOT/share/Geant4-10.1.3/data/PhotonEvaporation3.1"
G4RADIOACTIVEDATA: "$GEANT4_ROOT/share/Geant4-10.1.3/data/RadioactiveDecay4.2"
G4LEDATA: "$GEANT4_ROOT/share/Geant4-10.1.3/data/G4EMLOW6.41"
G4NEUTRONHPDATA: "$GEANT4_ROOT/share/Geant4-10.1.3/data/G4NDL4.5"
G4NEUTRONXSDATA: "$GEANT4_ROOT/share/Geant4-10.1.3/data/G4NEUTRONXS1.4"
G4SAIDXSDATA: "$GEANT4_ROOT/share/Geant4-10.1.3/data/G4SAIDDATA1.1"
G4NeutronHPCrossSections: "$GEANT4_ROOT/share/Geant4-10.1.3/data/G4NDL"
G4PIIDATA: "$GEANT4_ROOT/share/Geant4-10.1.3/data/G4PII1.3"
G4REALSURFACEDATA: "$GEANT4_ROOT/share/Geant4-10.1.3/data/RealSurface1.0"
G4ENSDFSTATEDATA: "$GEANT4_ROOT/share/Geant4-10.1.3/data/G4ENSDFSTATE1.0"
---
#!/bin/bash -e

Expand Down
3 changes: 2 additions & 1 deletion o2.sh
Original file line number Diff line number Diff line change
Expand Up @@ -29,7 +29,7 @@ case $ARCHITECTURE in
esac

cmake $SOURCEDIR -DCMAKE_INSTALL_PREFIX=$INSTALLROOT \
-DCMAKE_MODULE_PATH="$SOURCEDIR/cmake/modules;$FAIRROOT_ROOT/share/fairbase/cmake/modules" \
-DCMAKE_MODULE_PATH="$SOURCEDIR/cmake/modules;$FAIRROOT_ROOT/share/fairbase/cmake/modules;$FAIRROOT_ROOT/share/fairbase/cmake/modules_old" \
-DFairRoot_DIR=$FAIRROOT_ROOT \
-DALICEO2_MODULAR_BUILD=ON \
-DROOTSYS=$ROOTSYS \
Expand Down Expand Up @@ -63,6 +63,7 @@ module-whatis "ALICE Modulefile for $PKGNAME $PKGVERSION-@@PKGREVISION@$PKGHASH@
module load BASE/1.0 FairRoot/$FAIRROOT_VERSION-$FAIRROOT_REVISION ${DDS_ROOT:+DDS/$DDS_VERSION-$DDS_REVISION} ${GCC_TOOLCHAIN_ROOT:+GCC-Toolchain/$GCC_TOOLCHAIN_VERSION-$GCC_TOOLCHAIN_REVISION}
# Our environment
setenv O2_ROOT \$::env(BASEDIR)/$PKGNAME/\$version
setenv VMCWORKDIR \$::env(O2_ROOT)/share
prepend-path PATH \$::env(O2_ROOT)/bin
prepend-path LD_LIBRARY_PATH \$::env(O2_ROOT)/lib
$([[ ${ARCHITECTURE:0:3} == osx ]] && echo "prepend-path DYLD_LIBRARY_PATH \$::env(O2_ROOT)/lib")
Expand Down

0 comments on commit 9d6f22c

Please sign in to comment.