Merge branch 'master' into linopt_module

.gitmodules

@@ -7,3 +7,6 @@
 [submodule "lib/DISTlib"]
 	path = lib/DISTlib
 	url = https://github.com/SixTrack/DISTlib.git
+[submodule "source/FlukaIO"]
+	path = lib/FlukaIO
+	url = https://:@gitlab.cern.ch:8443/bmi/fedb/coupling/flukaio.git

CMakeLists.txt

@@ -403,21 +403,6 @@ endif(ZLIB)
 # Checking if some requested packages exist
 ###################################################################################################
 
-if(G4COLLIMATION)
-  if(STATIC)
-    find_package(Geant4 REQUIRED static)
-  else()
-    find_package(Geant4 REQUIRED)
-  endif(STATIC)
-
-  #no error checking yet
-  message(STATUS "Geant4 include folders: ${Geant4_INCLUDE_DIRS}")
-  message(STATUS "Geant4 use file: ${Geant4_USE_FILE}")
-  message(STATUS "Geant4 libraries: ${Geant4_LIBRARIES}")
-  message(STATUS "Geant4 definitions: ${Geant4_DEFINITIONS}")
-  add_subdirectory(${CMAKE_SOURCE_DIR}/source/g4collimation)
-endif(G4COLLIMATION)
-
 ##Possible check for Root
 if(ROOT)
   #/usr/share/root/cmake/FindROOT.cmake
@@ -430,9 +415,28 @@ if(ROOT)
   if(NOT ROOT_FOUND)
     MESSAGE(FATAL_ERROR "Root enabled build requested but root was not found!")
   endif(NOT ROOT_FOUND)
+  MESSAGE(STATUS "ROOT include folders: ${ROOT_INCLUDE_DIRS}")
+  MESSAGE(STATUS "ROOT definitions:${ROOT_DEFINITIONS}")
+  MESSAGE(STATUS "ROOT CXX flags:  ${ROOT_CXX_FLAGS}")
   add_subdirectory(${CMAKE_SOURCE_DIR}/source/root_output)
 endif(ROOT)
 
+if(G4COLLIMATION)
+  if(STATIC)
+    find_package(Geant4 REQUIRED static)
+  else()
+    find_package(Geant4 REQUIRED)
+  endif(STATIC)
+
+  #no error checking yet
+  message(STATUS "Geant4 include folders: ${Geant4_INCLUDE_DIRS}")
+  message(STATUS "Geant4 use file: ${Geant4_USE_FILE}")
+  message(STATUS "Geant4 libraries: ${Geant4_LIBRARIES}")
+  message(STATUS "Geant4 definitions: ${Geant4_DEFINITIONS}")
+  message(STATUS "Geant4 CXX flags: ${Geant4_CXX_FLAGS}")
+  add_subdirectory(${CMAKE_SOURCE_DIR}/source/g4collimation)
+endif(G4COLLIMATION)
+
 if(BUILD_TESTING OR BOINC OR G4COLLIMATION OR CERNLIB)
 
   find_package(Threads REQUIRED)
@@ -1325,7 +1329,22 @@ if(BOINC)
 endif()
 
 if(FLUKA)
-  add_subdirectory(${CMAKE_SOURCE_DIR}/source/FlukaIO)
+  if(GIT_FOUND)
+    message(STATUS "Checking out FlukaIO submodule")
+    execute_process(
+      COMMAND ${GIT_EXECUTABLE} submodule update --init lib/FlukaIO
+      WORKING_DIRECTORY ${CMAKE_CURRENT_SOURCE_DIR}
+      RESULT_VARIABLE GIT_SUBMOD_RESULT
+      ERROR_QUIET
+    )
+    if(NOT GIT_SUBMOD_RESULT EQUAL "0")
+      message(FATAL_ERROR "git submodule update --init lib/FlukaIO failed with ${GIT_SUBMOD_RESULT}, please checkout submodules")
+    endif()
+  else()
+    message(FATAL_ERROR "The git submodule FlukaIO is not available. Please download it into lib/FlukaIO")
+  endif()
+
+  add_subdirectory(${CMAKE_SOURCE_DIR}/lib/FlukaIO)
   target_link_libraries(SixTrackCore flukaIO)
 endif(FLUKA)
 

doc/user_manual/chSpecialElements.tex

@@ -2235,8 +2235,9 @@ \subsection{Collimation with Geant4}
 \paragraph{Select Physics List} \texttt{PHYSICS phys}\\
 
 The \texttt{PHYSICS} flag selects which physics list to use in Geant4.
-Currently FTFP\_BERT and QGSP\_BERT are allowed.
 If no flag is specified, the simulation will default to FTFP\_BERT.
+Any Geant4 physics list is allowed.
+Please see \url{http://geant4-userdoc.web.cern.ch/geant4-userdoc/UsersGuides/PhysicsListGuide/html/index.html} for more details.
 
 \bigskip
 \begin{tabular}{@{}llp{0.7\linewidth}}