ComputationalRadiationPhysics · Flamefire · Oct 23, 2016 · Oct 18, 2016
diff --git a/CMakeLists.txt b/CMakeLists.txt
@@ -286,26 +286,26 @@ if(PARAM_OVERWRITES)
 endif(PARAM_OVERWRITES)
 
 ################################################################################
-# XRT
+# PARATAXIS
 ################################################################################
 
-set(XRT_VERBOSE "1" CACHE STRING "Set verbosity level for XRT")
-add_definitions(-DXRT_VERBOSE_LVL=${XRT_VERBOSE})
-option(XRT_CHECK_PHOTON_CT "Checks if the number of photons generated can fit into the memory" ON)
-option(XRT_FORCE_SINGLE_SCATTERING "Make particles scatter only once" OFF)
-set(XRT_NVPROF_START_TS 200 CACHE STRING "Start profiling at this timestep")
-set(XRT_NVPROF_NUM_TS 0 CACHE STRING "Number of timesteps to profile. 0 = Disabled") 
-if(XRT_CHECK_PHOTON_CT)
-    add_definitions(-DXRT_CHECK_PHOTON_CT=1)
+set(PARATAXIS_VERBOSE "1" CACHE STRING "Set verbosity level for PARATAXIS")
+add_definitions(-DPARATAXIS_VERBOSE_LVL=${PARATAXIS_VERBOSE})
+option(PARATAXIS_CHECK_PHOTON_CT "Checks if the number of photons generated can fit into the memory" ON)
+option(PARATAXIS_FORCE_SINGLE_SCATTERING "Make particles scatter only once" OFF)
+set(PARATAXIS_NVPROF_START_TS 200 CACHE STRING "Start profiling at this timestep")
+set(PARATAXIS_NVPROF_NUM_TS 0 CACHE STRING "Number of timesteps to profile. 0 = Disabled") 
+if(PARATAXIS_CHECK_PHOTON_CT)
+    add_definitions(-DPARATAXIS_CHECK_PHOTON_CT=1)
 else()
-    add_definitions(-DXRT_CHECK_PHOTON_CT=0)
+    add_definitions(-DPARATAXIS_CHECK_PHOTON_CT=0)
 endif()
-if(XRT_FORCE_SINGLE_SCATTERING)
-    add_definitions(-DXRT_FORCE_SINGLE_SCATTERING=1)
+if(PARATAXIS_FORCE_SINGLE_SCATTERING)
+    add_definitions(-DPARATAXIS_FORCE_SINGLE_SCATTERING=1)
 else()
-    add_definitions(-DXRT_FORCE_SINGLE_SCATTERING=0)
+    add_definitions(-DPARATAXIS_FORCE_SINGLE_SCATTERING=0)
 endif()
-add_definitions(-DXRT_NVPROF_START_TS=${XRT_NVPROF_START_TS} -DXRT_NVPROF_NUM_TS=${XRT_NVPROF_NUM_TS})
+add_definitions(-DPARATAXIS_NVPROF_START_TS=${PARATAXIS_NVPROF_START_TS} -DPARATAXIS_NVPROF_NUM_TS=${PARATAXIS_NVPROF_NUM_TS})
 
 ################################################################################
 # Warnings
@@ -341,12 +341,12 @@ find_package(Splash 1.4.0 COMPONENTS PARALLEL)
 
 if(Splash_FOUND)
     include_directories(SYSTEM ${Splash_INCLUDE_DIRS})
-    list(APPEND Splash_DEFINITIONS "-DXRT_ENABLE_HDF5=1")
+    list(APPEND Splash_DEFINITIONS "-DPARATAXIS_ENABLE_HDF5=1")
     add_definitions(${Splash_DEFINITIONS})
     list(APPEND LIBS ${Splash_LIBRARIES})
     message(STATUS "HDF5 support activated")
 else()
-    add_definitions("-DXRT_ENABLE_HDF5=0")
+    add_definitions("-DPARATAXIS_ENABLE_HDF5=0")
 endif(Splash_FOUND)
 
 
@@ -359,12 +359,12 @@ find_package(PNGwriter 0.5.5)
 
 if(PNGwriter_FOUND)
     include_directories(SYSTEM ${PNGwriter_INCLUDE_DIRS})
-    list(APPEND PNGwriter_DEFINITIONS "-DXRT_ENABLE_PNG=1")
+    list(APPEND PNGwriter_DEFINITIONS "-DPARATAXIS_ENABLE_PNG=1")
     add_definitions(${PNGwriter_DEFINITIONS})
     list(APPEND LIBS ${PNGwriter_LIBRARIES})
     message(STATUS "PNG output support activated")
 else()
-    add_definitions("-DXRT_ENABLE_PNG=0")
+    add_definitions("-DPARATAXIS_ENABLE_PNG=0")
 endif()
 
 ################################################################################
@@ -375,12 +375,12 @@ find_package(TiffWriter 0.2.0)
 
 if(TiffWriter_FOUND)
     include_directories(${TiffWriter_INCLUDE_DIRS})
-    list(APPEND TiffWriter_DEFINITIONS "-DXRT_ENABLE_TIFF=1")
+    list(APPEND TiffWriter_DEFINITIONS "-DPARATAXIS_ENABLE_TIFF=1")
     add_definitions(${TiffWriter_DEFINITIONS})
     list(APPEND LIBS ${TiffWriter_LIBRARIES})
     message(STATUS "TIFF output support activated")
 else()
-    add_definitions("-DXRT_ENABLE_TIFF=0")
+    add_definitions("-DPARATAXIS_ENABLE_TIFF=0")
 endif()
 
 ################################################################################
@@ -393,10 +393,10 @@ set(CUDA_NVCC_FLAGS "${CUDA_NVCC_FLAGS} -std=c++11")
 
 
 ################################################################################
-# Check for XRT_EXTENSION_PATH
+# Check for PARATAXIS_EXTENSION_PATH
 ################################################################################
 
-find_path(XRT_EXTENSION_PATH
+find_path(PARATAXIS_EXTENSION_PATH
     NAMES include/simulation_defines/param/precision.param include/simulation_defines/param/speciesDefinition.param
     PATHS "${CMAKE_CURRENT_SOURCE_DIR}"
     DOC "search PATH to extension folder"
@@ -406,9 +406,9 @@ find_path(XRT_EXTENSION_PATH
     )
 
 include_directories(include)
-if(XRT_EXTENSION_PATH)
-    include_directories(BEFORE ${XRT_EXTENSION_PATH}/include)
-    message(STATUS "Using extension path: ${XRT_EXTENSION_PATH}")
+if(PARATAXIS_EXTENSION_PATH)
+    include_directories(BEFORE ${PARATAXIS_EXTENSION_PATH}/include)
+    message(STATUS "Using extension path: ${PARATAXIS_EXTENSION_PATH}")
 endif()
 
 ################################################################################
@@ -452,21 +452,21 @@ endif(SCOREP_ENABLE)
 # Configure
 ################################################################################
 
-set(XRT_BASE_CFG_PATH "${CMAKE_CURRENT_SOURCE_DIR}/submit")
-file(GLOB CFG_Files RELATIVE "${XRT_BASE_CFG_PATH}" "${XRT_BASE_CFG_PATH}/*.cfg.in")
-if(XRT_EXTENSION_PATH)
-    set(XRT_EXTENSION_CFG_PATH "${XRT_EXTENSION_PATH}/submit")
-    file(GLOB CFG_Files_Ext RELATIVE "${XRT_EXTENSION_CFG_PATH}" "${XRT_EXTENSION_CFG_PATH}/*.cfg.in")
+set(PARATAXIS_BASE_CFG_PATH "${CMAKE_CURRENT_SOURCE_DIR}/submit")
+file(GLOB CFG_Files RELATIVE "${PARATAXIS_BASE_CFG_PATH}" "${PARATAXIS_BASE_CFG_PATH}/*.cfg.in")
+if(PARATAXIS_EXTENSION_PATH)
+    set(PARATAXIS_EXTENSION_CFG_PATH "${PARATAXIS_EXTENSION_PATH}/submit")
+    file(GLOB CFG_Files_Ext RELATIVE "${PARATAXIS_EXTENSION_CFG_PATH}" "${PARATAXIS_EXTENSION_CFG_PATH}/*.cfg.in")
     list(APPEND CFG_Files ${CFG_Files_Ext})
     list(REMOVE_DUPLICATES CFG_Files)
 endif()
 
 foreach(fileName ${CFG_Files})
     get_filename_component(fileNoExt ${fileName} NAME_WE)
-    if(XRT_EXTENSION_PATH AND EXISTS "${XRT_EXTENSION_CFG_PATH}/${fileName}")
-        set(file "${XRT_EXTENSION_CFG_PATH}/${fileName}")
+    if(PARATAXIS_EXTENSION_PATH AND EXISTS "${PARATAXIS_EXTENSION_CFG_PATH}/${fileName}")
+        set(file "${PARATAXIS_EXTENSION_CFG_PATH}/${fileName}")
     else()
-        set(file "${XRT_BASE_CFG_PATH}/${fileName}")
+        set(file "${PARATAXIS_BASE_CFG_PATH}/${fileName}")
     endif()
     configure_file(${file} "submit/${fileNoExt}.cfg" @ONLY)
 endforeach()
@@ -506,11 +506,11 @@ install(DIRECTORY "${CMAKE_CURRENT_BINARY_DIR}/submit"
 install(DIRECTORY "include/simulation_defines"
         DESTINATION ${CMAKE_INSTALL_PREFIX})
 # Extension simulation config (overwrite base)
-if(XRT_EXTENSION_PATH)
+if(PARATAXIS_EXTENSION_PATH)
     # Overwrite with extension files
-    ForceCopyOnInstall("${XRT_EXTENSION_PATH}/include" "simulation_defines")
-    if(EXISTS "${XRT_EXTENSION_PATH}/testData")
-        install(DIRECTORY "${XRT_EXTENSION_PATH}/testData"
+    ForceCopyOnInstall("${PARATAXIS_EXTENSION_PATH}/include" "simulation_defines")
+    if(EXISTS "${PARATAXIS_EXTENSION_PATH}/testData")
+        install(DIRECTORY "${PARATAXIS_EXTENSION_PATH}/testData"
                 DESTINATION ${CMAKE_INSTALL_PREFIX})
     endif()
 endif()

diff --git a/buildSystem/Compilation.py b/buildSystem/Compilation.py
@@ -102,7 +102,7 @@ def configure(self, pathToCMakeLists, dryRun, verbose, silent):
         cmd = 'mkdir -p "' + buildPath + '" && cd "' + buildPath + '"\n'
         cmd += "cmake"
         cmd += " " + self.example.getCMakeFlags()[self.cmakePreset].replace(";", "\\;")
-        cmd += ' -DXRT_EXTENSION_PATH="' + self.example.getFolder() + '"'
+        cmd += ' -DPARATAXIS_EXTENSION_PATH="' + self.example.getFolder() + '"'
         cmd += ' -DCMAKE_INSTALL_PREFIX="' + self.getInstallPath() + '"'
         cmd += ' "' + pathToCMakeLists + '"'
         if dryRun or verbose:

diff --git a/configureExample.sh b/configureExample.sh
@@ -116,7 +116,7 @@ fi
 
 cd $destinationDir
 
-cmake_command="cmake $cmakeFlags -DXRT_EXTENSION_PATH=$exampleDir $this_dir"
+cmake_command="cmake $cmakeFlags -DPARATAXIS_EXTENSION_PATH=$exampleDir $this_dir"
 echo -e "\033[32mcmake command:\033[0m $cmake_command"
 $cmake_command
 result=$?

diff --git a/examples/Diplomarbeit/cmakeFlags b/examples/Diplomarbeit/cmakeFlags
@@ -26,7 +26,7 @@
 flags[0]="-DPARAM_OVERWRITES:LIST=-DPARAM_SLIT_OFFSET=70;-DPARAM_SLIT_SPACING=8;-DPARAM_SLIT_WIDTH=3;-DPARAM_START_POSITIONS=Const;-DPARAM_PRECISION=precision64Bit"
 flags[1]="-DPARAM_OVERWRITES:LIST=-DPARAM_SLIT_OFFSET=70;-DPARAM_SLIT_SPACING=8;-DPARAM_SLIT_WIDTH=3;-DPARAM_START_POSITIONS=Random;-DPARAM_PRECISION=precision64Bit"
 flags[2]="-DPARAM_OVERWRITES:LIST=-DPARAM_SLIT_OFFSET=70;-DPARAM_SLIT_SPACING=8;-DPARAM_SLIT_WIDTH=3;-DPARAM_START_POSITIONS=Random;-DPARAM_PRECISION=precision32Bit"
-flags[3]="-DPARAM_OVERWRITES:LIST=-DPARAM_SLIT_OFFSET=70;-DPARAM_SLIT_SPACING=8;-DPARAM_SLIT_WIDTH=3;-DPARAM_START_POSITIONS=Random;-DPARAM_PRECISION=precision64Bit;-DXRT_USE_SLOW_RNG=1"
+flags[3]="-DPARAM_OVERWRITES:LIST=-DPARAM_SLIT_OFFSET=70;-DPARAM_SLIT_SPACING=8;-DPARAM_SLIT_WIDTH=3;-DPARAM_START_POSITIONS=Random;-DPARAM_PRECISION=precision64Bit;-DPARATAXIS_USE_SLOW_RNG=1"
 flags[4]="-DPARAM_OVERWRITES:LIST=-DPARAM_SLIT_OFFSET=70;-DPARAM_SLIT_SPACING=8;-DPARAM_SLIT_WIDTH=3;-DPARAM_START_POSITIONS=Random;-DPARAM_PRECISION=precision64Bit;-DPARAM_NUM_PARTS=1"
 flags[5]="-DPARAM_OVERWRITES:LIST=-DPARAM_SLIT_OFFSET=70;-DPARAM_SLIT_SPACING=8;-DPARAM_SLIT_WIDTH=3;-DPARAM_START_POSITIONS=Random;-DPARAM_PRECISION=precision64Bit;-DPARAM_NUM_PARTS=2"
 flags[6]="-DPARAM_OVERWRITES:LIST=-DPARAM_SLIT_OFFSET=70;-DPARAM_SLIT_SPACING=8;-DPARAM_SLIT_WIDTH=3;-DPARAM_START_POSITIONS=Random;-DPARAM_PRECISION=precision64Bit;-DPARAM_NUM_PARTS=5"

diff --git a/examples/Diplomarbeit/include/simulation_defines/param/detectorConfig.param b/examples/Diplomarbeit/include/simulation_defines/param/detectorConfig.param
@@ -19,7 +19,7 @@
 
 #pragma once
 
-namespace xrt {
+namespace parataxis {
 namespace detector {
 
     namespace particleHandlers {
@@ -74,4 +74,4 @@ namespace detector {
     };
 
 }  // namespace detector
-}  // namespace xrt
+}  // namespace parataxis
diff --git a/examples/Diplomarbeit/include/simulation_defines/param/initialDensity.param b/examples/Diplomarbeit/include/simulation_defines/param/initialDensity.param
@@ -35,7 +35,7 @@
 #   define PARAM_SLIT_SPACING2 PARAM_SLIT_SPACING
 #endif
 
-namespace xrt {
+namespace parataxis {
 namespace initialDensity {
 
     namespace AvailableGenerators{
@@ -80,4 +80,4 @@ namespace initialDensity {
             AvailableGenerators::PARAM_GENERATOR;
 
 }  // namespace initialDensity
-}  // namespace xrt
+}  // namespace parataxis
diff --git a/examples/Diplomarbeit/include/simulation_defines/param/laserConfig.param b/examples/Diplomarbeit/include/simulation_defines/param/laserConfig.param
@@ -25,7 +25,7 @@
 #   define PARAM_NUM_PARTS 10
 #endif
 
-namespace xrt {
+namespace parataxis {
 namespace laserConfig {
 
     /* Initialization for the 'laser' */
@@ -100,5 +100,5 @@ namespace laserConfig {
     constexpr int32_t DIRECTION = 0;
 
 }  // namespace laserConfig
-}  // namespace xrt
+}  // namespace parataxis
 
diff --git a/examples/Diplomarbeit/include/simulation_defines/param/memory.param b/examples/Diplomarbeit/include/simulation_defines/param/memory.param
@@ -22,7 +22,7 @@
 #include <math/Vector.hpp>
 #include <mappings/kernel/MappingDescription.hpp>
 
-namespace xrt {
+namespace parataxis {
 
     constexpr uint32_t KiB = 1024;
     constexpr uint32_t MiB = 1024 * KiB;
@@ -52,5 +52,5 @@ namespace xrt {
 
     }  // namespace exchangeSize
 
-}  // namespace xrt
+}  // namespace parataxis
 
diff --git a/examples/Diplomarbeit/include/simulation_defines/param/precision.param b/examples/Diplomarbeit/include/simulation_defines/param/precision.param
@@ -19,7 +19,7 @@
 
 #pragma once
 
-namespace xrt
+namespace parataxis
 {
     namespace precision32Bit{}
     namespace precision64Bit{}
@@ -30,18 +30,18 @@ namespace xrt
      *  - precision64Bit : use 64Bit floating point numbers (need CUDA_ARCH>=sm_20)
      *                     [significant digits 15 to 16]
      */
-    namespace precisionXRT      = PARAM_PRECISION;
+    namespace precisionPARATAXIS      = PARAM_PRECISION;
 
     /*! Select a precision special operations (can be different from simulation precision)
-     *  - precisionXRT : use precision which is selected on top
+     *  - precisionPARATAXIS : use precision which is selected on top
      *  - precision32Bit    : use 32Bit floating point numbers
      *  - precision64Bit    : use 64Bit floating point numbers
      */
-    namespace precisionSqrt          = precisionXRT;
-    namespace precisionExp           = precisionXRT;
-    namespace precisionTrigonometric = precisionXRT;
+    namespace precisionSqrt          = precisionPARATAXIS;
+    namespace precisionExp           = precisionPARATAXIS;
+    namespace precisionTrigonometric = precisionPARATAXIS;
 
 
-}//namespace xrt
+}//namespace parataxis
 
 #include "simulation_defines/unitless/precision.unitless"
diff --git a/examples/Diplomarbeit/startProfiling.sh b/examples/Diplomarbeit/startProfiling.sh
@@ -17,13 +17,13 @@
 # You should have received a copy of the GNU General Public License
 # along with ParaTAXIS.  If not, see <http://www.gnu.org/licenses/>.
 
-rm -rf ~/xrtTestsProfiling
+outputFolder="$HOME/parataxisTestsProfiling"
 export TBG_TPLFILE=submit/hypnos-hzdr/k20_nvprof_profile.tpl
 export TBG_CFGFILE=submit/8gpuProfiling.cfg
 export TBG_SUBMIT=qsub
-outputFolder="$HOME/xrtTestsProfiling"
+rm -rf "${outputFolder}"
 
-buildSystem/runTests.py -e examples/Diplomarbeit/ -o "$outputFolder" -t "DoubleSlitRandPos" -t "DoubleSlitRandPosSingle" -j -DCUDA_ARCH=sm_35 -DXRT_NVPROF_NUM_TS=5 -DXRT_NVPROF_START_TS=2998 -r --compile-only && \
+buildSystem/runTests.py -e examples/Diplomarbeit/ -o "$outputFolder" -t "DoubleSlitRandPos" -t "DoubleSlitRandPosSingle" -j -DCUDA_ARCH=sm_35 -DPARATAXIS_NVPROF_NUM_TS=5 -DPARATAXIS_NVPROF_START_TS=2998 -r --compile-only && \
 cd "$outputFolder"/installed/DiplomarbeitSim_cmake1 && \
 tbg -t -s -c "$outputFolder"/output/profilingDouble && \
 cd "$outputFolder"/installed/DiplomarbeitSim_cmake2 && \

diff --git a/examples/DiplomarbeitMulti/cmakeFlags b/examples/DiplomarbeitMulti/cmakeFlags
@@ -23,21 +23,21 @@
 #   - start with zero index
 #   - increase by 1, no gaps
 
-flags[0]="-DPARAM_OVERWRITES:LIST=-DPARAM_ROOM_WIDTH=1;-DPARAM_GENERATOR=DoubleSlit;-DPARAM_PRECISION=precision64Bit -DXRT_FORCE_SINGLE_SCATTERING=1"
-flags[1]="-DPARAM_OVERWRITES:LIST=-DPARAM_ROOM_WIDTH=999999;-DPARAM_GENERATOR=DoubleSlit;-DPARAM_PRECISION=precision64Bit -DXRT_FORCE_SINGLE_SCATTERING=1"
-flags[2]="-DPARAM_OVERWRITES:LIST=-DPARAM_ROOM_WIDTH=999999;-DPARAM_GENERATOR=DoubleSlit;-DPARAM_PRECISION=precision64Bit -DXRT_FORCE_SINGLE_SCATTERING=0"
-flags[3]="-DPARAM_OVERWRITES:LIST=-DPARAM_ROOM_WIDTH=1;-DPARAM_GENERATOR=Edge;-DPARAM_PRECISION=precision64Bit -DXRT_FORCE_SINGLE_SCATTERING=1"
-flags[4]="-DPARAM_OVERWRITES:LIST=-DPARAM_ROOM_WIDTH=999999;-DPARAM_GENERATOR=Edge;-DPARAM_PRECISION=precision64Bit -DXRT_FORCE_SINGLE_SCATTERING=1"
-flags[5]="-DPARAM_OVERWRITES:LIST=-DPARAM_ROOM_WIDTH=999999;-DPARAM_GENERATOR=Edge;-DPARAM_PRECISION=precision64Bit -DXRT_FORCE_SINGLE_SCATTERING=0"
+flags[0]="-DPARAM_OVERWRITES:LIST=-DPARAM_ROOM_WIDTH=1;-DPARAM_GENERATOR=DoubleSlit;-DPARAM_PRECISION=precision64Bit -DPARATAXIS_FORCE_SINGLE_SCATTERING=1"
+flags[1]="-DPARAM_OVERWRITES:LIST=-DPARAM_ROOM_WIDTH=999999;-DPARAM_GENERATOR=DoubleSlit;-DPARAM_PRECISION=precision64Bit -DPARATAXIS_FORCE_SINGLE_SCATTERING=1"
+flags[2]="-DPARAM_OVERWRITES:LIST=-DPARAM_ROOM_WIDTH=999999;-DPARAM_GENERATOR=DoubleSlit;-DPARAM_PRECISION=precision64Bit -DPARATAXIS_FORCE_SINGLE_SCATTERING=0"
+flags[3]="-DPARAM_OVERWRITES:LIST=-DPARAM_ROOM_WIDTH=1;-DPARAM_GENERATOR=Edge;-DPARAM_PRECISION=precision64Bit -DPARATAXIS_FORCE_SINGLE_SCATTERING=1"
+flags[4]="-DPARAM_OVERWRITES:LIST=-DPARAM_ROOM_WIDTH=999999;-DPARAM_GENERATOR=Edge;-DPARAM_PRECISION=precision64Bit -DPARATAXIS_FORCE_SINGLE_SCATTERING=1"
+flags[5]="-DPARAM_OVERWRITES:LIST=-DPARAM_ROOM_WIDTH=999999;-DPARAM_GENERATOR=Edge;-DPARAM_PRECISION=precision64Bit -DPARATAXIS_FORCE_SINGLE_SCATTERING=0"
 #Single
-flags[6]="-DPARAM_OVERWRITES:LIST=-DPARAM_ROOM_WIDTH=999999;-DPARAM_GENERATOR=DoubleSlit;-DPARAM_PRECISION=precision32Bit -DXRT_FORCE_SINGLE_SCATTERING=1"
-flags[7]="-DPARAM_OVERWRITES:LIST=-DPARAM_ROOM_WIDTH=999999;-DPARAM_GENERATOR=DoubleSlit;-DPARAM_PRECISION=precision32Bit -DXRT_FORCE_SINGLE_SCATTERING=0"
-flags[8]="-DPARAM_OVERWRITES:LIST=-DPARAM_ROOM_WIDTH=1;-DPARAM_GENERATOR=Edge;-DPARAM_PRECISION=precision32Bit -DXRT_FORCE_SINGLE_SCATTERING=1"
-flags[9]="-DPARAM_OVERWRITES:LIST=-DPARAM_ROOM_WIDTH=999999;-DPARAM_GENERATOR=Edge;-DPARAM_PRECISION=precision32Bit -DXRT_FORCE_SINGLE_SCATTERING=1"
-flags[10]="-DPARAM_OVERWRITES:LIST=-DPARAM_ROOM_WIDTH=999999;-DPARAM_GENERATOR=Edge;-DPARAM_PRECISION=precision32Bit -DXRT_FORCE_SINGLE_SCATTERING=0"
+flags[6]="-DPARAM_OVERWRITES:LIST=-DPARAM_ROOM_WIDTH=999999;-DPARAM_GENERATOR=DoubleSlit;-DPARAM_PRECISION=precision32Bit -DPARATAXIS_FORCE_SINGLE_SCATTERING=1"
+flags[7]="-DPARAM_OVERWRITES:LIST=-DPARAM_ROOM_WIDTH=999999;-DPARAM_GENERATOR=DoubleSlit;-DPARAM_PRECISION=precision32Bit -DPARATAXIS_FORCE_SINGLE_SCATTERING=0"
+flags[8]="-DPARAM_OVERWRITES:LIST=-DPARAM_ROOM_WIDTH=1;-DPARAM_GENERATOR=Edge;-DPARAM_PRECISION=precision32Bit -DPARATAXIS_FORCE_SINGLE_SCATTERING=1"
+flags[9]="-DPARAM_OVERWRITES:LIST=-DPARAM_ROOM_WIDTH=999999;-DPARAM_GENERATOR=Edge;-DPARAM_PRECISION=precision32Bit -DPARATAXIS_FORCE_SINGLE_SCATTERING=1"
+flags[10]="-DPARAM_OVERWRITES:LIST=-DPARAM_ROOM_WIDTH=999999;-DPARAM_GENERATOR=Edge;-DPARAM_PRECISION=precision32Bit -DPARATAXIS_FORCE_SINGLE_SCATTERING=0"
 # Grid
-flags[11]="-DPARAM_OVERWRITES:LIST=-DPARAM_INITIAL_DENSITY=0.01;-DPARAM_ROOM_WIDTH=512;-DPARAM_GENERATOR=CombinedGenerator;-DPARAM_PRECISION=precision64Bit -DXRT_FORCE_SINGLE_SCATTERING=1"
-flags[12]="-DPARAM_OVERWRITES:LIST=-DPARAM_INITIAL_DENSITY=0.01;-DPARAM_ROOM_WIDTH=512;-DPARAM_GENERATOR=CombinedGenerator;-DPARAM_PRECISION=precision64Bit -DXRT_FORCE_SINGLE_SCATTERING=0"
+flags[11]="-DPARAM_OVERWRITES:LIST=-DPARAM_INITIAL_DENSITY=0.01;-DPARAM_ROOM_WIDTH=512;-DPARAM_GENERATOR=CombinedGenerator;-DPARAM_PRECISION=precision64Bit -DPARATAXIS_FORCE_SINGLE_SCATTERING=1"
+flags[12]="-DPARAM_OVERWRITES:LIST=-DPARAM_INITIAL_DENSITY=0.01;-DPARAM_ROOM_WIDTH=512;-DPARAM_GENERATOR=CombinedGenerator;-DPARAM_PRECISION=precision64Bit -DPARATAXIS_FORCE_SINGLE_SCATTERING=0"
 
 ################################################################################
 # execution

diff --git a/examples/DiplomarbeitMulti/include/simulation_defines/param/detectorConfig.param b/examples/DiplomarbeitMulti/include/simulation_defines/param/detectorConfig.param
@@ -19,7 +19,7 @@
 
 #pragma once
 
-namespace xrt {
+namespace parataxis {
 namespace detector {
 
     namespace particleHandlers {
@@ -74,4 +74,4 @@ namespace detector {
     };
 
 }  // namespace detector
-}  // namespace xrt
+}  // namespace parataxis
diff --git a/examples/DiplomarbeitMulti/include/simulation_defines/param/initialDensity.param b/examples/DiplomarbeitMulti/include/simulation_defines/param/initialDensity.param
@@ -25,7 +25,7 @@
 #   define PARAM_INITIAL_DENSITY 0.001
 #endif
 
-namespace xrt {
+namespace parataxis {
 namespace initialDensity {
 
     namespace AvailableGenerators{
@@ -108,4 +108,4 @@ namespace initialDensity {
             AvailableGenerators::PARAM_GENERATOR;
 
 }  // namespace initialDensity
-}  // namespace xrt
+}  // namespace parataxis
diff --git a/examples/DiplomarbeitMulti/include/simulation_defines/param/laserConfig.param b/examples/DiplomarbeitMulti/include/simulation_defines/param/laserConfig.param
@@ -21,7 +21,7 @@
 
 #include <math/vector/Float.hpp>
 
-namespace xrt {
+namespace parataxis {
 namespace laserConfig {
 
     /* Initialization for the 'laser' */
@@ -84,5 +84,5 @@ namespace laserConfig {
     constexpr int32_t DIRECTION = 0;
 
 }  // namespace laserConfig
-}  // namespace xrt
+}  // namespace parataxis