From 44774803bbb033b12b8bcf1cdb27135d31b58df4 Mon Sep 17 00:00:00 2001 From: Ben Morgan Date: Fri, 29 Nov 2019 12:39:58 +0000 Subject: [PATCH 1/2] Use correct type for tweakable generator spectrum Fixes #167 --- resources/genbb/ConfigurableSources.conf | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/resources/genbb/ConfigurableSources.conf b/resources/genbb/ConfigurableSources.conf index 54017a031..306108040 100644 --- a/resources/genbb/ConfigurableSources.conf +++ b/resources/genbb/ConfigurableSources.conf @@ -43,7 +43,7 @@ #@variant_if primary_events:generator/if_tweakable/energy_mode/if_spectrum|false spectrum.mode : string = @variant(primary_events:generator/if_tweakable/energy_mode/if_spectrum/mode|"tabulated_function") - spectrum.data_file : string as path = @variant(primary_events:generator/if_tweakable/energy_mode/if_spectrum/datafile|"") + spectrum.data_file : string as path = @variant(primary_events:generator/if_tweakable/energy_mode/if_spectrum/file|"") #@variant_endif primary_events:generator/if_tweakable/energy_mode/if_spectrum emission_direction : string = @variant(primary_events:generator/if_tweakable/direction_mode|"randomized") From 6c6745a83414b101925de4591ac87e1551864f01 Mon Sep 17 00:00:00 2001 From: Ben Morgan Date: Fri, 29 Nov 2019 12:42:22 +0000 Subject: [PATCH 2/2] Bump patch version --- CMakeLists.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/CMakeLists.txt b/CMakeLists.txt index e3a1d940c..e5e71c17a 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -38,7 +38,7 @@ endif() # CMake/project requirements and configuration # cmake_minimum_required(VERSION 3.3 FATAL_ERROR) -project(Falaise VERSION "4.0.1") +project(Falaise VERSION "4.0.2") # - Load custom modules list(INSERT CMAKE_MODULE_PATH 0 ${PROJECT_SOURCE_DIR}/cmake)