diff --git a/mcstas-comps/examples/Tests_union/Unit_test_abs_logger_1D_space/README.md b/mcstas-comps/examples/Tests_union/Test_abs_logger_1D_space/README.md similarity index 82% rename from mcstas-comps/examples/Tests_union/Unit_test_abs_logger_1D_space/README.md rename to mcstas-comps/examples/Tests_union/Test_abs_logger_1D_space/README.md index f4dbf51a2e..21797c6cde 100644 --- a/mcstas-comps/examples/Tests_union/Unit_test_abs_logger_1D_space/README.md +++ b/mcstas-comps/examples/Tests_union/Test_abs_logger_1D_space/README.md @@ -1,4 +1,4 @@ -# The `Unit_test_abs_logger_1D_space` Instrument +# The `Test_abs_logger_1D_space` Instrument *McStas: Test of the 1 dimensional spatial absorption logger* @@ -29,6 +29,6 @@ Parameters in **boldface** are required; the others are optional. ## Links -- [Source code](Unit_test_abs_logger_1D_space.instr) for `Unit_test_abs_logger_1D_space.instr`. +- [Source code](Test_abs_logger_1D_space.instr) for `Test_abs_logger_1D_space.instr`. --- diff --git a/mcstas-comps/examples/Tests_union/Unit_test_abs_logger_1D_space/Unit_test_abs_logger_1D_space.instr b/mcstas-comps/examples/Tests_union/Test_abs_logger_1D_space/Test_abs_logger_1D_space.instr similarity index 97% rename from mcstas-comps/examples/Tests_union/Unit_test_abs_logger_1D_space/Unit_test_abs_logger_1D_space.instr rename to mcstas-comps/examples/Tests_union/Test_abs_logger_1D_space/Test_abs_logger_1D_space.instr index ade0da9d20..b97968f52d 100644 --- a/mcstas-comps/examples/Tests_union/Unit_test_abs_logger_1D_space/Unit_test_abs_logger_1D_space.instr +++ b/mcstas-comps/examples/Tests_union/Test_abs_logger_1D_space/Test_abs_logger_1D_space.instr @@ -5,7 +5,7 @@ * Risoe National Laboratory, Roskilde, Denmark * Institut Laue Langevin, Grenoble, France * -* Instrument: Union_unit_test_abs_logger_1D_space +* Instrument: Test_abs_logger_1D_space * * %Identification * Written by: Mads Bertelsen @@ -29,7 +29,7 @@ * %End *******************************************************************************/ -DEFINE INSTRUMENT Unit_test_abs_logger_1D_space() +DEFINE INSTRUMENT Test_abs_logger_1D_space() DECLARE %{ diff --git a/mcstas-comps/examples/Tests_union/Unit_test_abs_logger_1D_space_event/README.md b/mcstas-comps/examples/Tests_union/Test_abs_logger_1D_space_event/README.md similarity index 69% rename from mcstas-comps/examples/Tests_union/Unit_test_abs_logger_1D_space_event/README.md rename to mcstas-comps/examples/Tests_union/Test_abs_logger_1D_space_event/README.md index 57c7de755a..d6bdc77cb7 100644 --- a/mcstas-comps/examples/Tests_union/Unit_test_abs_logger_1D_space_event/README.md +++ b/mcstas-comps/examples/Tests_union/Test_abs_logger_1D_space_event/README.md @@ -1,4 +1,4 @@ -# The `Unit_test_abs_logger_1D_space_event` Instrument +# The `Test_abs_logger_1D_space_event` Instrument *McStas: Test of Union_abs_logger_1D_space_event* @@ -24,6 +24,6 @@ Parameters in **boldface** are required; the others are optional. ## Links -- [Source code](Unit_test_abs_logger_1D_space_event.instr) for `Unit_test_abs_logger_1D_space_event.instr`. +- [Source code](Test_abs_logger_1D_space_event.instr) for `Test_abs_logger_1D_space_event.instr`. --- diff --git a/mcstas-comps/examples/Tests_union/Unit_test_abs_logger_1D_space_event/Unit_test_abs_logger_1D_space_event.instr b/mcstas-comps/examples/Tests_union/Test_abs_logger_1D_space_event/Test_abs_logger_1D_space_event.instr similarity index 96% rename from mcstas-comps/examples/Tests_union/Unit_test_abs_logger_1D_space_event/Unit_test_abs_logger_1D_space_event.instr rename to mcstas-comps/examples/Tests_union/Test_abs_logger_1D_space_event/Test_abs_logger_1D_space_event.instr index 9c73171ae3..9a3b43c669 100644 --- a/mcstas-comps/examples/Tests_union/Unit_test_abs_logger_1D_space_event/Unit_test_abs_logger_1D_space_event.instr +++ b/mcstas-comps/examples/Tests_union/Test_abs_logger_1D_space_event/Test_abs_logger_1D_space_event.instr @@ -5,7 +5,7 @@ * Risoe National Laboratory, Roskilde, Denmark * Institut Laue Langevin, Grenoble, France * -* Instrument: Unit_test_abs_logger_1D_space_event +* Instrument: Test_abs_logger_1D_space_event * * %Identification * Written by: Mads Bertelsen @@ -24,7 +24,7 @@ * %End *******************************************************************************/ -DEFINE INSTRUMENT Unit_test_abs_logger_1D_space_event() +DEFINE INSTRUMENT Test_abs_logger_1D_space_event() DECLARE %{ diff --git a/mcstas-comps/examples/Tests_union/Unit_test_abs_logger_1D_space_tof/README.md b/mcstas-comps/examples/Tests_union/Test_abs_logger_1D_space_t/README.md similarity index 78% rename from mcstas-comps/examples/Tests_union/Unit_test_abs_logger_1D_space_tof/README.md rename to mcstas-comps/examples/Tests_union/Test_abs_logger_1D_space_t/README.md index 5263420c89..59cdcd3858 100644 --- a/mcstas-comps/examples/Tests_union/Unit_test_abs_logger_1D_space_tof/README.md +++ b/mcstas-comps/examples/Tests_union/Test_abs_logger_1D_space_t/README.md @@ -1,4 +1,4 @@ -# The `Unit_test_abs_logger_1D_space_tof` Instrument +# The `Test_abs_logger_1D_space_t` Instrument *McStas: Test of abs_logger_1D_space_tof* @@ -28,6 +28,6 @@ Parameters in **boldface** are required; the others are optional. ## Links -- [Source code](Unit_test_abs_logger_1D_space_tof.instr) for `Unit_test_abs_logger_1D_space_tof.instr`. +- [Source code](Test_abs_logger_1D_space_t.instr) for `Test_abs_logger_1D_space_t.instr`. --- diff --git a/mcstas-comps/examples/Tests_union/Unit_test_abs_logger_1D_space_tof/Unit_test_abs_logger_1D_space_tof.instr b/mcstas-comps/examples/Tests_union/Test_abs_logger_1D_space_t/Test_abs_logger_1D_space_t.instr similarity index 96% rename from mcstas-comps/examples/Tests_union/Unit_test_abs_logger_1D_space_tof/Unit_test_abs_logger_1D_space_tof.instr rename to mcstas-comps/examples/Tests_union/Test_abs_logger_1D_space_t/Test_abs_logger_1D_space_t.instr index acb06ce4ef..0e876e3721 100644 --- a/mcstas-comps/examples/Tests_union/Unit_test_abs_logger_1D_space_tof/Unit_test_abs_logger_1D_space_tof.instr +++ b/mcstas-comps/examples/Tests_union/Test_abs_logger_1D_space_t/Test_abs_logger_1D_space_t.instr @@ -5,7 +5,7 @@ * Risoe National Laboratory, Roskilde, Denmark * Institut Laue Langevin, Grenoble, France * -* Instrument: Unit_test_abs_logger_1D_space_tof +* Instrument: Test_abs_logger_1D_space_t * * %Identification * Written by: Mads Bertelsen @@ -28,7 +28,7 @@ * %End *******************************************************************************/ -DEFINE INSTRUMENT Unit_test_abs_logger_1D_space_tof() +DEFINE INSTRUMENT Test_abs_logger_1D_space_t() DECLARE %{ diff --git a/mcstas-comps/examples/Tests_union/Unit_test_abs_logger_1D_space_tof_to_lambda/README.md b/mcstas-comps/examples/Tests_union/Test_abs_logger_1D_space_t_lam/README.md similarity index 86% rename from mcstas-comps/examples/Tests_union/Unit_test_abs_logger_1D_space_tof_to_lambda/README.md rename to mcstas-comps/examples/Tests_union/Test_abs_logger_1D_space_t_lam/README.md index 58e8c4fafa..e80ab0f440 100644 --- a/mcstas-comps/examples/Tests_union/Unit_test_abs_logger_1D_space_tof_to_lambda/README.md +++ b/mcstas-comps/examples/Tests_union/Test_abs_logger_1D_space_t_lam/README.md @@ -1,4 +1,4 @@ -# The `Unit_test_abs_logger_1D_space_tof_to_lambda` Instrument +# The `Test_abs_logger_1D_space_t_lam` Instrument *McStas: Test of abs_logger_1D_space_tof_to_lambda that calculates wavelength from tof* @@ -35,6 +35,6 @@ Parameters in **boldface** are required; the others are optional. ## Links -- [Source code](Unit_test_abs_logger_1D_space_tof_to_lambda.instr) for `Unit_test_abs_logger_1D_space_tof_to_lambda.instr`. +- [Source code](Test_abs_logger_1D_space_t_lam.instr) for `Test_abs_logger_1D_space_t_lam.instr`. --- diff --git a/mcstas-comps/examples/Tests_union/Unit_test_abs_logger_1D_space_tof_to_lambda/Unit_test_abs_logger_1D_space_tof_to_lambda.instr b/mcstas-comps/examples/Tests_union/Test_abs_logger_1D_space_t_lam/Test_abs_logger_1D_space_t_lam.instr similarity index 97% rename from mcstas-comps/examples/Tests_union/Unit_test_abs_logger_1D_space_tof_to_lambda/Unit_test_abs_logger_1D_space_tof_to_lambda.instr rename to mcstas-comps/examples/Tests_union/Test_abs_logger_1D_space_t_lam/Test_abs_logger_1D_space_t_lam.instr index 456337d714..c1b0b0b75b 100644 --- a/mcstas-comps/examples/Tests_union/Unit_test_abs_logger_1D_space_tof_to_lambda/Unit_test_abs_logger_1D_space_tof_to_lambda.instr +++ b/mcstas-comps/examples/Tests_union/Test_abs_logger_1D_space_t_lam/Test_abs_logger_1D_space_t_lam.instr @@ -5,7 +5,7 @@ * Risoe National Laboratory, Roskilde, Denmark * Institut Laue Langevin, Grenoble, France * -* Instrument: Unit_test_abs_logger_1D_space_tof_to_lambda +* Instrument: Test_abs_logger_1D_space_t_lam * * %Identification * Written by: Mads Bertelsen @@ -36,7 +36,7 @@ * %End *******************************************************************************/ -DEFINE INSTRUMENT Unit_test_abs_logger_1D_space_tof_to_lambda() +DEFINE INSTRUMENT Test_abs_logger_1D_space_t_lam() DECLARE %{ diff --git a/mcstas-comps/examples/Tests_union/Unit_test_abs_logger_1D_time/README.md b/mcstas-comps/examples/Tests_union/Test_abs_logger_1D_t/README.md similarity index 80% rename from mcstas-comps/examples/Tests_union/Unit_test_abs_logger_1D_time/README.md rename to mcstas-comps/examples/Tests_union/Test_abs_logger_1D_t/README.md index d66f0f8dc9..ff6c61b826 100644 --- a/mcstas-comps/examples/Tests_union/Unit_test_abs_logger_1D_time/README.md +++ b/mcstas-comps/examples/Tests_union/Test_abs_logger_1D_t/README.md @@ -1,4 +1,4 @@ -# The `Unit_test_abs_logger_1D_time` Instrument +# The `Test_abs_logger_1D_t` Instrument *McStas: Test of Union 1D time absorption logger* @@ -28,6 +28,6 @@ Parameters in **boldface** are required; the others are optional. ## Links -- [Source code](Unit_test_abs_logger_1D_time.instr) for `Unit_test_abs_logger_1D_time.instr`. +- [Source code](Test_abs_logger_1D_t.instr) for `Test_abs_logger_1D_t.instr`. --- diff --git a/mcstas-comps/examples/Tests_union/Unit_test_abs_logger_1D_time/Unit_test_abs_logger_1D_time.instr b/mcstas-comps/examples/Tests_union/Test_abs_logger_1D_t/Test_abs_logger_1D_t.instr similarity index 97% rename from mcstas-comps/examples/Tests_union/Unit_test_abs_logger_1D_time/Unit_test_abs_logger_1D_time.instr rename to mcstas-comps/examples/Tests_union/Test_abs_logger_1D_t/Test_abs_logger_1D_t.instr index cf770dd92c..a55dc2683b 100644 --- a/mcstas-comps/examples/Tests_union/Unit_test_abs_logger_1D_time/Unit_test_abs_logger_1D_time.instr +++ b/mcstas-comps/examples/Tests_union/Test_abs_logger_1D_t/Test_abs_logger_1D_t.instr @@ -5,7 +5,7 @@ * Risoe National Laboratory, Roskilde, Denmark * Institut Laue Langevin, Grenoble, France * -* Instrument: Unit_test_abs_logger_1D_time +* Instrument: Test_abs_logger_1D_t * * %Identification * Written by: Mads Bertelsen @@ -28,7 +28,7 @@ * %End *******************************************************************************/ -DEFINE INSTRUMENT Unit_test_abs_logger_1D_time() +DEFINE INSTRUMENT Test_abs_logger_1D_t() DECLARE %{ diff --git a/mcstas-comps/examples/Tests_union/Unit_test_abs_logger_2D_space/README.md b/mcstas-comps/examples/Tests_union/Test_abs_logger_2D_space/README.md similarity index 68% rename from mcstas-comps/examples/Tests_union/Unit_test_abs_logger_2D_space/README.md rename to mcstas-comps/examples/Tests_union/Test_abs_logger_2D_space/README.md index 4c5a24f751..deba8842b7 100644 --- a/mcstas-comps/examples/Tests_union/Unit_test_abs_logger_2D_space/README.md +++ b/mcstas-comps/examples/Tests_union/Test_abs_logger_2D_space/README.md @@ -1,4 +1,4 @@ -# The `Unit_test_abs_logger_2D_space` Instrument +# The `Test_abs_logger_2D_space` Instrument *McStas: Test for Union_abs_logger_2D_space* @@ -12,7 +12,7 @@ ## Description ```text -Test of absorption logger with basic geometry from Unit_test_loggers_base. +Test of absorption logger with basic geometry from Test_loggers_base. Includes conditional component to test record_to_temp functionality of investigated abs_logger. @@ -27,6 +27,6 @@ Parameters in **boldface** are required; the others are optional. ## Links -- [Source code](Unit_test_abs_logger_2D_space.instr) for `Unit_test_abs_logger_2D_space.instr`. +- [Source code](Test_abs_logger_2D_space.instr) for `Test_abs_logger_2D_space.instr`. --- diff --git a/mcstas-comps/examples/Tests_union/Unit_test_abs_logger_2D_space/Unit_test_abs_logger_2D_space.instr b/mcstas-comps/examples/Tests_union/Test_abs_logger_2D_space/Test_abs_logger_2D_space.instr similarity index 95% rename from mcstas-comps/examples/Tests_union/Unit_test_abs_logger_2D_space/Unit_test_abs_logger_2D_space.instr rename to mcstas-comps/examples/Tests_union/Test_abs_logger_2D_space/Test_abs_logger_2D_space.instr index 52a37689eb..67db6b31b6 100644 --- a/mcstas-comps/examples/Tests_union/Unit_test_abs_logger_2D_space/Unit_test_abs_logger_2D_space.instr +++ b/mcstas-comps/examples/Tests_union/Test_abs_logger_2D_space/Test_abs_logger_2D_space.instr @@ -5,7 +5,7 @@ * Risoe National Laboratory, Roskilde, Denmark * Institut Laue Langevin, Grenoble, France * -* Instrument: Unit_test_abs_logger_2D_space +* Instrument: Test_abs_logger_2D_space * * %Identification * Written by: Mads Bertelsen @@ -16,7 +16,7 @@ * Test for Union_abs_logger_2D_space * * %Description -* Test of absorption logger with basic geometry from Unit_test_loggers_base. +* Test of absorption logger with basic geometry from Test_loggers_base. * * Includes conditional component to test record_to_temp functionality * of investigated abs_logger. @@ -27,7 +27,7 @@ * %End *******************************************************************************/ -DEFINE INSTRUMENT Unit_test_abs_logger_2D_space() +DEFINE INSTRUMENT Test_abs_logger_2D_space() DECLARE %{ diff --git a/mcstas-comps/examples/Tests_union/Unit_test_abs_logger_event/README.md b/mcstas-comps/examples/Tests_union/Test_abs_logger_event/README.md similarity index 73% rename from mcstas-comps/examples/Tests_union/Unit_test_abs_logger_event/README.md rename to mcstas-comps/examples/Tests_union/Test_abs_logger_event/README.md index a9f4b30cf1..370621ddcc 100644 --- a/mcstas-comps/examples/Tests_union/Unit_test_abs_logger_event/README.md +++ b/mcstas-comps/examples/Tests_union/Test_abs_logger_event/README.md @@ -1,4 +1,4 @@ -# The `Unit_test_abs_logger_event` Instrument +# The `Test_abs_logger_event` Instrument *McStas: Test of Union_abs_logger_event* @@ -24,6 +24,6 @@ Parameters in **boldface** are required; the others are optional. ## Links -- [Source code](Unit_test_abs_logger_event.instr) for `Unit_test_abs_logger_event.instr`. +- [Source code](Test_abs_logger_event.instr) for `Test_abs_logger_event.instr`. --- diff --git a/mcstas-comps/examples/Tests_union/Unit_test_abs_logger_event/Unit_test_abs_logger_event.instr b/mcstas-comps/examples/Tests_union/Test_abs_logger_event/Test_abs_logger_event.instr similarity index 97% rename from mcstas-comps/examples/Tests_union/Unit_test_abs_logger_event/Unit_test_abs_logger_event.instr rename to mcstas-comps/examples/Tests_union/Test_abs_logger_event/Test_abs_logger_event.instr index 773d6dd535..cc15785dff 100644 --- a/mcstas-comps/examples/Tests_union/Unit_test_abs_logger_event/Unit_test_abs_logger_event.instr +++ b/mcstas-comps/examples/Tests_union/Test_abs_logger_event/Test_abs_logger_event.instr @@ -5,7 +5,7 @@ * Risoe National Laboratory, Roskilde, Denmark * Institut Laue Langevin, Grenoble, France * -* Instrument: Unit_test_abs_logger_event +* Instrument: Test_abs_logger_event * * %Identification * Written by: Mads Bertelsen @@ -25,7 +25,7 @@ * %End *******************************************************************************/ -DEFINE INSTRUMENT Unit_test_abs_logger_event() +DEFINE INSTRUMENT Test_abs_logger_event() DECLARE %{ diff --git a/mcstas-comps/examples/Tests_union/Unit_test_abs_logger_nD/README.md b/mcstas-comps/examples/Tests_union/Test_abs_logger_nD/README.md similarity index 83% rename from mcstas-comps/examples/Tests_union/Unit_test_abs_logger_nD/README.md rename to mcstas-comps/examples/Tests_union/Test_abs_logger_nD/README.md index 1c0fd9208d..4da4260e51 100644 --- a/mcstas-comps/examples/Tests_union/Unit_test_abs_logger_nD/README.md +++ b/mcstas-comps/examples/Tests_union/Test_abs_logger_nD/README.md @@ -1,4 +1,4 @@ -# The `Unit_test_abs_logger_1D_space` Instrument +# The `Test_abs_logger_nD` Instrument *McStas: Test of the monitor_nD like absorption logger* @@ -29,6 +29,6 @@ Parameters in **boldface** are required; the others are optional. ## Links -- [Source code](Unit_test_abs_logger_nD.instr) for `Unit_test_abs_logger_nD.instr`. +- [Source code](Test_abs_logger_nD.instr) for `Test_abs_logger_nD.instr`. --- diff --git a/mcstas-comps/examples/Tests_union/Unit_test_abs_logger_nD/Unit_test_abs_logger_nD.instr b/mcstas-comps/examples/Tests_union/Test_abs_logger_nD/Test_abs_logger_nD.instr similarity index 97% rename from mcstas-comps/examples/Tests_union/Unit_test_abs_logger_nD/Unit_test_abs_logger_nD.instr rename to mcstas-comps/examples/Tests_union/Test_abs_logger_nD/Test_abs_logger_nD.instr index 8df301e28e..82cc6b4d70 100644 --- a/mcstas-comps/examples/Tests_union/Unit_test_abs_logger_nD/Unit_test_abs_logger_nD.instr +++ b/mcstas-comps/examples/Tests_union/Test_abs_logger_nD/Test_abs_logger_nD.instr @@ -5,7 +5,7 @@ * Risoe National Laboratory, Roskilde, Denmark * Institut Laue Langevin, Grenoble, France * -* Instrument: Union_unit_test_abs_logger_1D_space +* Instrument: Test_abs_logger_nD * * %Identification * Written by: Mads Bertelsen @@ -29,7 +29,7 @@ * %End *******************************************************************************/ -DEFINE INSTRUMENT Unit_test_abs_logger_1D_space() +DEFINE INSTRUMENT Test_abs_logger_nD() DECLARE %{ diff --git a/mcstas-comps/examples/Tests_union/Unit_test_conditional_PSD/README.md b/mcstas-comps/examples/Tests_union/Test_conditional_PSD/README.md similarity index 81% rename from mcstas-comps/examples/Tests_union/Unit_test_conditional_PSD/README.md rename to mcstas-comps/examples/Tests_union/Test_conditional_PSD/README.md index 525cc048de..bffd3e95a1 100644 --- a/mcstas-comps/examples/Tests_union/Unit_test_conditional_PSD/README.md +++ b/mcstas-comps/examples/Tests_union/Test_conditional_PSD/README.md @@ -1,4 +1,4 @@ -# The `Unit_test_conditional_PSD` Instrument +# The `Test_conditional_PSD` Instrument *McStas: Test of conditional_PSD* @@ -26,6 +26,6 @@ Parameters in **boldface** are required; the others are optional. ## Links -- [Source code](Unit_test_conditional_PSD.instr) for `Unit_test_conditional_PSD.instr`. +- [Source code](Test_conditional_PSD.instr) for `Test_conditional_PSD.instr`. --- diff --git a/mcstas-comps/examples/Tests_union/Unit_test_conditional_PSD/Unit_test_conditional_PSD.instr b/mcstas-comps/examples/Tests_union/Test_conditional_PSD/Test_conditional_PSD.instr similarity index 97% rename from mcstas-comps/examples/Tests_union/Unit_test_conditional_PSD/Unit_test_conditional_PSD.instr rename to mcstas-comps/examples/Tests_union/Test_conditional_PSD/Test_conditional_PSD.instr index c2dcf67be9..0b53ea4cbf 100644 --- a/mcstas-comps/examples/Tests_union/Unit_test_conditional_PSD/Unit_test_conditional_PSD.instr +++ b/mcstas-comps/examples/Tests_union/Test_conditional_PSD/Test_conditional_PSD.instr @@ -5,7 +5,7 @@ * Risoe National Laboratory, Roskilde, Denmark * Institut Laue Langevin, Grenoble, France * -* Instrument: Unit_test_conditional_PSD +* Instrument: Test_conditional_PSD * * %Identification * Written by: Mads Bertelsen @@ -25,7 +25,7 @@ * %End *******************************************************************************/ -DEFINE INSTRUMENT Unit_test_conditional_PSD() +DEFINE INSTRUMENT Test_conditional_PSD() DECLARE %{ diff --git a/mcstas-comps/examples/Tests_union/Unit_test_conditional_standard/README.md b/mcstas-comps/examples/Tests_union/Test_conditional_standard/README.md similarity index 80% rename from mcstas-comps/examples/Tests_union/Unit_test_conditional_standard/README.md rename to mcstas-comps/examples/Tests_union/Test_conditional_standard/README.md index 61f2cb24b2..a8371f4b1b 100644 --- a/mcstas-comps/examples/Tests_union/Unit_test_conditional_standard/README.md +++ b/mcstas-comps/examples/Tests_union/Test_conditional_standard/README.md @@ -1,4 +1,4 @@ -# The `Unit_test_conditional_standard` Instrument +# The `Test_conditional_standard` Instrument *McStas: Test of Union_conditional_standard* @@ -26,6 +26,6 @@ Parameters in **boldface** are required; the others are optional. ## Links -- [Source code](Unit_test_conditional_standard.instr) for `Unit_test_conditional_standard.instr`. +- [Source code](Test_conditional_standard.instr) for `Test_conditional_standard.instr`. --- diff --git a/mcstas-comps/examples/Tests_union/Unit_test_conditional_standard/Unit_test_conditional_standard.instr b/mcstas-comps/examples/Tests_union/Test_conditional_standard/Test_conditional_standard.instr similarity index 97% rename from mcstas-comps/examples/Tests_union/Unit_test_conditional_standard/Unit_test_conditional_standard.instr rename to mcstas-comps/examples/Tests_union/Test_conditional_standard/Test_conditional_standard.instr index 298343c2b4..71e4a95b03 100644 --- a/mcstas-comps/examples/Tests_union/Unit_test_conditional_standard/Unit_test_conditional_standard.instr +++ b/mcstas-comps/examples/Tests_union/Test_conditional_standard/Test_conditional_standard.instr @@ -5,7 +5,7 @@ * Risoe National Laboratory, Roskilde, Denmark * Institut Laue Langevin, Grenoble, France * -* Instrument: Unit_test_conditional_standard +* Instrument: Test_conditional_standard * * %Identification * Written by: Mads Bertelsen @@ -25,7 +25,7 @@ * %End *******************************************************************************/ -DEFINE INSTRUMENT Unit_test_conditional_standard() +DEFINE INSTRUMENT Test_conditional_standard() DECLARE %{ diff --git a/mcstas-comps/examples/Tests_union/Unit_test_logger_1D/README.md b/mcstas-comps/examples/Tests_union/Test_logger_1D/README.md similarity index 83% rename from mcstas-comps/examples/Tests_union/Unit_test_logger_1D/README.md rename to mcstas-comps/examples/Tests_union/Test_logger_1D/README.md index e27518b7f9..e61e5a637c 100644 --- a/mcstas-comps/examples/Tests_union/Unit_test_logger_1D/README.md +++ b/mcstas-comps/examples/Tests_union/Test_logger_1D/README.md @@ -1,4 +1,4 @@ -# The `Unit_test_logger_1D` Instrument +# The `Test_logger_1D` Instrument *McStas: Test of Union 1D logger* @@ -28,6 +28,6 @@ Parameters in **boldface** are required; the others are optional. ## Links -- [Source code](Unit_test_logger_1D.instr) for `Unit_test_logger_1D.instr`. +- [Source code](Test_logger_1D.instr) for `Test_logger_1D.instr`. --- diff --git a/mcstas-comps/examples/Tests_union/Unit_test_logger_1D/Unit_test_logger_1D.instr b/mcstas-comps/examples/Tests_union/Test_logger_1D/Test_logger_1D.instr similarity index 97% rename from mcstas-comps/examples/Tests_union/Unit_test_logger_1D/Unit_test_logger_1D.instr rename to mcstas-comps/examples/Tests_union/Test_logger_1D/Test_logger_1D.instr index 7582efc31d..4d44b6c2cd 100644 --- a/mcstas-comps/examples/Tests_union/Unit_test_logger_1D/Unit_test_logger_1D.instr +++ b/mcstas-comps/examples/Tests_union/Test_logger_1D/Test_logger_1D.instr @@ -5,7 +5,7 @@ * Risoe National Laboratory, Roskilde, Denmark * Institut Laue Langevin, Grenoble, France * -* Instrument: Unit_test_logger_1D +* Instrument: Test_logger_1D * * %Identification * Written by: Mads Bertelsen @@ -28,7 +28,7 @@ * %End *******************************************************************************/ -DEFINE INSTRUMENT Unit_test_logger_1D() +DEFINE INSTRUMENT Test_logger_1D() DECLARE %{ diff --git a/mcstas-comps/examples/Tests_union/Unit_test_logger_2DQ/README.md b/mcstas-comps/examples/Tests_union/Test_logger_2DQ/README.md similarity index 86% rename from mcstas-comps/examples/Tests_union/Unit_test_logger_2DQ/README.md rename to mcstas-comps/examples/Tests_union/Test_logger_2DQ/README.md index da153f11f7..d5c090e8da 100644 --- a/mcstas-comps/examples/Tests_union/Unit_test_logger_2DQ/README.md +++ b/mcstas-comps/examples/Tests_union/Test_logger_2DQ/README.md @@ -1,4 +1,4 @@ -# The `Unit_test_logger_2DQ` Instrument +# The `Test_logger_2DQ` Instrument *McStas: Test of the Union 2DQ logger that shows scattering vector projected onto 2D plane* @@ -29,6 +29,6 @@ Parameters in **boldface** are required; the others are optional. ## Links -- [Source code](Unit_test_logger_2DQ.instr) for `Unit_test_logger_2DQ.instr`. +- [Source code](Test_logger_2DQ.instr) for `Test_logger_2DQ.instr`. --- diff --git a/mcstas-comps/examples/Tests_union/Unit_test_logger_2DQ/Unit_test_logger_2DQ.instr b/mcstas-comps/examples/Tests_union/Test_logger_2DQ/Test_logger_2DQ.instr similarity index 97% rename from mcstas-comps/examples/Tests_union/Unit_test_logger_2DQ/Unit_test_logger_2DQ.instr rename to mcstas-comps/examples/Tests_union/Test_logger_2DQ/Test_logger_2DQ.instr index abc168c0eb..6839f2a179 100644 --- a/mcstas-comps/examples/Tests_union/Unit_test_logger_2DQ/Unit_test_logger_2DQ.instr +++ b/mcstas-comps/examples/Tests_union/Test_logger_2DQ/Test_logger_2DQ.instr @@ -5,7 +5,7 @@ * Risoe National Laboratory, Roskilde, Denmark * Institut Laue Langevin, Grenoble, France * -* Instrument: Unit_test_logger_2DQ +* Instrument: Test_logger_2DQ * * %Identification * Written by: Mads Bertelsen @@ -29,7 +29,7 @@ * %End *******************************************************************************/ -DEFINE INSTRUMENT Unit_test_logger_2DQ() +DEFINE INSTRUMENT Test_logger_2DQ() DECLARE %{ diff --git a/mcstas-comps/examples/Tests_union/Unit_test_logger_2D_kf/README.md b/mcstas-comps/examples/Tests_union/Test_logger_2D_kf/README.md similarity index 84% rename from mcstas-comps/examples/Tests_union/Unit_test_logger_2D_kf/README.md rename to mcstas-comps/examples/Tests_union/Test_logger_2D_kf/README.md index 06c9a7d285..701ad2637b 100644 --- a/mcstas-comps/examples/Tests_union/Unit_test_logger_2D_kf/README.md +++ b/mcstas-comps/examples/Tests_union/Test_logger_2D_kf/README.md @@ -1,4 +1,4 @@ -# The `Unit_test_logger_2D_kf` Instrument +# The `Test_logger_2D_kf` Instrument *McStas: Test of Union logger 2D kf that records the final wavevector* @@ -29,6 +29,6 @@ Parameters in **boldface** are required; the others are optional. ## Links -- [Source code](Unit_test_logger_2D_kf.instr) for `Unit_test_logger_2D_kf.instr`. +- [Source code](Test_logger_2D_kf.instr) for `Test_logger_2D_kf.instr`. --- diff --git a/mcstas-comps/examples/Tests_union/Unit_test_logger_2D_kf/Unit_test_logger_2D_kf.instr b/mcstas-comps/examples/Tests_union/Test_logger_2D_kf/Test_logger_2D_kf.instr similarity index 97% rename from mcstas-comps/examples/Tests_union/Unit_test_logger_2D_kf/Unit_test_logger_2D_kf.instr rename to mcstas-comps/examples/Tests_union/Test_logger_2D_kf/Test_logger_2D_kf.instr index 1945565880..8d85bee787 100644 --- a/mcstas-comps/examples/Tests_union/Unit_test_logger_2D_kf/Unit_test_logger_2D_kf.instr +++ b/mcstas-comps/examples/Tests_union/Test_logger_2D_kf/Test_logger_2D_kf.instr @@ -5,7 +5,7 @@ * Risoe National Laboratory, Roskilde, Denmark * Institut Laue Langevin, Grenoble, France * -* Instrument: Unit_test_logger_2D_kf +* Instrument: Test_logger_2D_kf * * %Identification * Written by: Mads Bertelsen @@ -29,7 +29,7 @@ * %End *******************************************************************************/ -DEFINE INSTRUMENT Unit_test_logger_2D_kf() +DEFINE INSTRUMENT Test_logger_2D_kf() DECLARE %{ diff --git a/mcstas-comps/examples/Tests_union/Unit_test_logger_2D_kf_time/README.md b/mcstas-comps/examples/Tests_union/Test_logger_2D_kf_t/README.md similarity index 84% rename from mcstas-comps/examples/Tests_union/Unit_test_logger_2D_kf_time/README.md rename to mcstas-comps/examples/Tests_union/Test_logger_2D_kf_t/README.md index 62ddb673ae..89bd969119 100644 --- a/mcstas-comps/examples/Tests_union/Unit_test_logger_2D_kf_time/README.md +++ b/mcstas-comps/examples/Tests_union/Test_logger_2D_kf_t/README.md @@ -1,4 +1,4 @@ -# The `Unit_test_logger_2D_kf_time` Instrument +# The `Test_logger_2D_kf_t` Instrument *McStas: Tests Logger_2D_kf_time that records final wavevector in several time steps* @@ -29,6 +29,6 @@ Parameters in **boldface** are required; the others are optional. ## Links -- [Source code](Unit_test_logger_2D_kf_time.instr) for `Unit_test_logger_2D_kf_time.instr`. +- [Source code](Test_logger_2D_kf_t.instr) for `Test_logger_2D_kf_t.instr`. --- diff --git a/mcstas-comps/examples/Tests_union/Unit_test_logger_2D_kf_time/Unit_test_logger_2D_kf_time.instr b/mcstas-comps/examples/Tests_union/Test_logger_2D_kf_t/Test_logger_2D_kf_t.instr similarity index 97% rename from mcstas-comps/examples/Tests_union/Unit_test_logger_2D_kf_time/Unit_test_logger_2D_kf_time.instr rename to mcstas-comps/examples/Tests_union/Test_logger_2D_kf_t/Test_logger_2D_kf_t.instr index e4fe67dce4..80fe7af79c 100644 --- a/mcstas-comps/examples/Tests_union/Unit_test_logger_2D_kf_time/Unit_test_logger_2D_kf_time.instr +++ b/mcstas-comps/examples/Tests_union/Test_logger_2D_kf_t/Test_logger_2D_kf_t.instr @@ -5,7 +5,7 @@ * Risoe National Laboratory, Roskilde, Denmark * Institut Laue Langevin, Grenoble, France * -* Instrument: Unit_test_logger_2D_kf_time +* Instrument: Test_logger_2D_kf_t * * %Identification * Written by: Mads Bertelsen @@ -29,7 +29,7 @@ * %End *******************************************************************************/ -DEFINE INSTRUMENT Unit_test_logger_2D_kf_time() +DEFINE INSTRUMENT Test_logger_2D_kf_t() DECLARE %{ diff --git a/mcstas-comps/examples/Tests_union/Unit_test_logger_2D_space/README.md b/mcstas-comps/examples/Tests_union/Test_logger_2D_space/README.md similarity index 82% rename from mcstas-comps/examples/Tests_union/Unit_test_logger_2D_space/README.md rename to mcstas-comps/examples/Tests_union/Test_logger_2D_space/README.md index 1ed8001a10..a3ae46624d 100644 --- a/mcstas-comps/examples/Tests_union/Unit_test_logger_2D_space/README.md +++ b/mcstas-comps/examples/Tests_union/Test_logger_2D_space/README.md @@ -1,4 +1,4 @@ -# The `Unit_test_logger_2D_space` Instrument +# The `Test_logger_2D_space` Instrument *McStas: Test of 2 dimensional spatial logger* @@ -29,6 +29,6 @@ Parameters in **boldface** are required; the others are optional. ## Links -- [Source code](Unit_test_logger_2D_space.instr) for `Unit_test_logger_2D_space.instr`. +- [Source code](Test_logger_2D_space.instr) for `Test_logger_2D_space.instr`. --- diff --git a/mcstas-comps/examples/Tests_union/Unit_test_logger_2D_space/Unit_test_logger_2D_space.instr b/mcstas-comps/examples/Tests_union/Test_logger_2D_space/Test_logger_2D_space.instr similarity index 97% rename from mcstas-comps/examples/Tests_union/Unit_test_logger_2D_space/Unit_test_logger_2D_space.instr rename to mcstas-comps/examples/Tests_union/Test_logger_2D_space/Test_logger_2D_space.instr index 3787469b19..18b4b7d473 100644 --- a/mcstas-comps/examples/Tests_union/Unit_test_logger_2D_space/Unit_test_logger_2D_space.instr +++ b/mcstas-comps/examples/Tests_union/Test_logger_2D_space/Test_logger_2D_space.instr @@ -5,7 +5,7 @@ * Risoe National Laboratory, Roskilde, Denmark * Institut Laue Langevin, Grenoble, France * -* Instrument: Unit_test_logger_2D_space +* Instrument: Test_logger_2D_space * * %Identification * Written by: Mads Bertelsen @@ -29,7 +29,7 @@ * %End *******************************************************************************/ -DEFINE INSTRUMENT Unit_test_logger_2D_space() +DEFINE INSTRUMENT Test_logger_2D_space() DECLARE %{ diff --git a/mcstas-comps/examples/Tests_union/Unit_test_logger_2D_space_time/README.md b/mcstas-comps/examples/Tests_union/Test_logger_2D_space_t/README.md similarity index 84% rename from mcstas-comps/examples/Tests_union/Unit_test_logger_2D_space_time/README.md rename to mcstas-comps/examples/Tests_union/Test_logger_2D_space_t/README.md index fedd0493bf..bd82b769d0 100644 --- a/mcstas-comps/examples/Tests_union/Unit_test_logger_2D_space_time/README.md +++ b/mcstas-comps/examples/Tests_union/Test_logger_2D_space_t/README.md @@ -1,4 +1,4 @@ -# The `Unit_test_logger_2D_space_time` Instrument +# The `Test_logger_2D_space_t` Instrument *McStas: Test of Union logger 2D space time that records spatial distribution of scattering in time steps* @@ -30,6 +30,6 @@ Parameters in **boldface** are required; the others are optional. ## Links -- [Source code](Unit_test_logger_2D_space_time.instr) for `Unit_test_logger_2D_space_time.instr`. +- [Source code](Test_logger_2D_space_t.instr) for `Test_logger_2D_space_t.instr`. --- diff --git a/mcstas-comps/examples/Tests_union/Unit_test_logger_2D_space_time/Unit_test_logger_2D_space_time.instr b/mcstas-comps/examples/Tests_union/Test_logger_2D_space_t/Test_logger_2D_space_t.instr similarity index 97% rename from mcstas-comps/examples/Tests_union/Unit_test_logger_2D_space_time/Unit_test_logger_2D_space_time.instr rename to mcstas-comps/examples/Tests_union/Test_logger_2D_space_t/Test_logger_2D_space_t.instr index 7347e8233b..20351dbf51 100644 --- a/mcstas-comps/examples/Tests_union/Unit_test_logger_2D_space_time/Unit_test_logger_2D_space_time.instr +++ b/mcstas-comps/examples/Tests_union/Test_logger_2D_space_t/Test_logger_2D_space_t.instr @@ -5,7 +5,7 @@ * Risoe National Laboratory, Roskilde, Denmark * Institut Laue Langevin, Grenoble, France * -* Instrument: Unit_test_logger_2D_space_time +* Instrument: Test_logger_2D_space_t * * %Identification * Written by: Mads Bertelsen @@ -30,7 +30,7 @@ * %End *******************************************************************************/ -DEFINE INSTRUMENT Unit_test_logger_2D_space_time() +DEFINE INSTRUMENT Test_logger_2D_space_t() DECLARE %{ diff --git a/mcstas-comps/examples/Tests_union/Unit_test_logger_3D_space/README.md b/mcstas-comps/examples/Tests_union/Test_logger_3D_space/README.md similarity index 82% rename from mcstas-comps/examples/Tests_union/Unit_test_logger_3D_space/README.md rename to mcstas-comps/examples/Tests_union/Test_logger_3D_space/README.md index 6d3c639855..96e51721b1 100644 --- a/mcstas-comps/examples/Tests_union/Unit_test_logger_3D_space/README.md +++ b/mcstas-comps/examples/Tests_union/Test_logger_3D_space/README.md @@ -1,4 +1,4 @@ -# The `Unit_test_logger_3D_space` Instrument +# The `Test_logger_3D_space` Instrument *McStas: Test of the Union_logger_3D_space* @@ -28,6 +28,6 @@ Parameters in **boldface** are required; the others are optional. ## Links -- [Source code](Unit_test_logger_3D_space.instr) for `Unit_test_logger_3D_space.instr`. +- [Source code](Test_logger_3D_space.instr) for `Test_logger_3D_space.instr`. --- diff --git a/mcstas-comps/examples/Tests_union/Unit_test_logger_3D_space/Unit_test_logger_3D_space.instr b/mcstas-comps/examples/Tests_union/Test_logger_3D_space/Test_logger_3D_space.instr similarity index 97% rename from mcstas-comps/examples/Tests_union/Unit_test_logger_3D_space/Unit_test_logger_3D_space.instr rename to mcstas-comps/examples/Tests_union/Test_logger_3D_space/Test_logger_3D_space.instr index 352767178f..bc7aba7fc8 100644 --- a/mcstas-comps/examples/Tests_union/Unit_test_logger_3D_space/Unit_test_logger_3D_space.instr +++ b/mcstas-comps/examples/Tests_union/Test_logger_3D_space/Test_logger_3D_space.instr @@ -5,7 +5,7 @@ * Risoe National Laboratory, Roskilde, Denmark * Institut Laue Langevin, Grenoble, France * -* Instrument: Unit_test_logger_3D_space +* Instrument: Test_logger_3D_space * * %Identification * Written by: Mads Bertelsen @@ -28,7 +28,7 @@ * %End *******************************************************************************/ -DEFINE INSTRUMENT Unit_test_logger_3D_space() +DEFINE INSTRUMENT Test_logger_3D_space() DECLARE %{ diff --git a/mcstas-comps/examples/Tests_union/Unit_test_loggers_base/README.md b/mcstas-comps/examples/Tests_union/Test_loggers_base/README.md similarity index 75% rename from mcstas-comps/examples/Tests_union/Unit_test_loggers_base/README.md rename to mcstas-comps/examples/Tests_union/Test_loggers_base/README.md index f3ed234100..28b5512144 100644 --- a/mcstas-comps/examples/Tests_union/Unit_test_loggers_base/README.md +++ b/mcstas-comps/examples/Tests_union/Test_loggers_base/README.md @@ -1,4 +1,4 @@ -# The `Unit_test_loggers_base` Instrument +# The `Test_loggers_base` Instrument *McStas: Base instrument for logger unit tests* @@ -24,6 +24,6 @@ Parameters in **boldface** are required; the others are optional. ## Links -- [Source code](Unit_test_loggers_base.instr) for `Unit_test_loggers_base.instr`. +- [Source code](Test_loggers_base.instr) for `Test_loggers_base.instr`. --- diff --git a/mcstas-comps/examples/Tests_union/Unit_test_loggers_base/Unit_test_loggers_base.instr b/mcstas-comps/examples/Tests_union/Test_loggers_base/Test_loggers_base.instr similarity index 96% rename from mcstas-comps/examples/Tests_union/Unit_test_loggers_base/Unit_test_loggers_base.instr rename to mcstas-comps/examples/Tests_union/Test_loggers_base/Test_loggers_base.instr index ec4fa55eaf..ce1b2f2080 100644 --- a/mcstas-comps/examples/Tests_union/Unit_test_loggers_base/Unit_test_loggers_base.instr +++ b/mcstas-comps/examples/Tests_union/Test_loggers_base/Test_loggers_base.instr @@ -5,7 +5,7 @@ * Risoe National Laboratory, Roskilde, Denmark * Institut Laue Langevin, Grenoble, France * -* Instrument: Union_unit_test_loggers_base +* Instrument: Test_loggers_base * * %Identification * Written by: Mads Bertelsen @@ -24,7 +24,7 @@ * %End *******************************************************************************/ -DEFINE INSTRUMENT Unit_test_loggers_base() +DEFINE INSTRUMENT Test_loggers_base() DECLARE %{ diff --git a/mcstas-comps/union/Union_abs_logger_1D_space.comp b/mcstas-comps/union/Union_abs_logger_1D_space.comp index cd1cb0ff41..34b975f5bf 100644 --- a/mcstas-comps/union/Union_abs_logger_1D_space.comp +++ b/mcstas-comps/union/Union_abs_logger_1D_space.comp @@ -67,6 +67,7 @@ * order_volume: [1] Only log rays that have scattered n times in the same geometry, -1 for all orders * logger_conditional_extend_index: [1] If a conditional is used with this logger, the result of each conditional calculation can be made available in extend as a array called "logger_conditional_extend", and one would then access logger_conditional_extend[n] if logger_conditional_extend_index is set to n * init: [string] name of Union_init component (typically "init", default) +* nowritefile: [1] If set, logger will skip writing to disk * * CALCULATED PARAMETERS: * @@ -81,7 +82,7 @@ DEFINE COMPONENT Union_abs_logger_1D_space SETTING PARAMETERS(string target_geometry="NULL", yheight, n=100, - string filename="NULL", order_total=-1, order_volume=-1, logger_conditional_extend_index=-1, string init="init") + string filename="NULL", order_total=-1, order_volume=-1, logger_conditional_extend_index=-1, string init="init", int nowritefile=0) /* Neutron parameters: (x,y,z,vx,vy,vz,t,sx,sy,sz,p) */ @@ -519,10 +520,12 @@ TRACE SAVE %{ // Write to disk - DETECTOR_OUT_1D (this_abs_storage.Detector_1D.title_string, this_abs_storage.Detector_1D.string_axis, this_abs_storage.Detector_1D.string_axis_value, - this_abs_storage.Detector_1D.string_axis_short, this_abs_storage.Detector_1D.min, this_abs_storage.Detector_1D.max, - this_abs_storage.Detector_1D.bins, &this_abs_storage.Detector_1D.Array_N[0], &this_abs_storage.Detector_1D.Array_p[0], - &this_abs_storage.Detector_1D.Array_p2[0], this_abs_storage.Detector_1D.Filename); + if (!nowritefile) { + DETECTOR_OUT_1D (this_abs_storage.Detector_1D.title_string, this_abs_storage.Detector_1D.string_axis, this_abs_storage.Detector_1D.string_axis_value, + this_abs_storage.Detector_1D.string_axis_short, this_abs_storage.Detector_1D.min, this_abs_storage.Detector_1D.max, + this_abs_storage.Detector_1D.bins, &this_abs_storage.Detector_1D.Array_N[0], &this_abs_storage.Detector_1D.Array_p[0], + &this_abs_storage.Detector_1D.Array_p2[0], this_abs_storage.Detector_1D.Filename); + } %} FINALLY diff --git a/mcstas-comps/union/Union_abs_logger_1D_space_event.comp b/mcstas-comps/union/Union_abs_logger_1D_space_event.comp index 5fdd6587cb..758e6d50f4 100644 --- a/mcstas-comps/union/Union_abs_logger_1D_space_event.comp +++ b/mcstas-comps/union/Union_abs_logger_1D_space_event.comp @@ -77,6 +77,7 @@ * order_volume: [1] Only log rays that have scattered n times in the same geometry, -1 for all orders * logger_conditional_extend_index: [1] If a conditional is used with this logger, the result of each conditional calculation can be made available in extend as a array called "logger_conditional_extend", and one would then access logger_conditional_extend[n] if logger_conditional_extend_index is set to n * init: [string] name of Union_init component (typically "init", default) +* nowritefile: [1] If set, logger will skip writing to disk * * CALCULATED PARAMETERS: * @@ -90,7 +91,7 @@ DEFINE COMPONENT Union_abs_logger_1D_space_event SETTING PARAMETERS(string target_geometry="NULL", yheight, int n, int fake_event=0, - string filename="NULL", order_total=-1, order_volume=-1, logger_conditional_extend_index=-1, string init="init") + string filename="NULL", order_total=-1, order_volume=-1, logger_conditional_extend_index=-1, string init="init", int nowritefile=0) /* Neutron parameters: (x,y,z,vx,vy,vz,t,sx,sy,sz,p) */ @@ -615,7 +616,9 @@ TRACE SAVE %{ - Monitor_nD_Save (&(this_abs_storage.DEFS), &(this_abs_storage.Vars)); + if (!nowritefile) { + Monitor_nD_Save (&(this_abs_storage.DEFS), &(this_abs_storage.Vars)); + } %} FINALLY diff --git a/mcstas-comps/union/Union_abs_logger_1D_space_tof.comp b/mcstas-comps/union/Union_abs_logger_1D_space_tof.comp index b321f4c2d7..a77dd7e185 100644 --- a/mcstas-comps/union/Union_abs_logger_1D_space_tof.comp +++ b/mcstas-comps/union/Union_abs_logger_1D_space_tof.comp @@ -70,6 +70,7 @@ * order_volume: [1] Only log rays that have scattered n times in the same geometry, -1 for all orders * logger_conditional_extend_index: [1] If a conditional is used with this logger, the result of each conditional calculation can be made available in extend as a array called "logger_conditional_extend", and one would then access logger_conditional_extend[n] if logger_conditional_extend_index is set to n * init: [string] name of Union_init component (typically "init", default) +* nowritefile: [1] If set, logger will skip writing to disk * * CALCULATED PARAMETERS: * @@ -85,7 +86,7 @@ DEFINE COMPONENT Union_abs_logger_1D_space_tof SETTING PARAMETERS(string target_geometry="NULL", yheight, n=0.2, time_min=0, time_max=1, time_bins=100, - string filename="NULL", order_total=-1, order_volume=-1, logger_conditional_extend_index=-1, string init="init") + string filename="NULL", order_total=-1, order_volume=-1, logger_conditional_extend_index=-1, string init="init", int nowritefile=0) /* Neutron parameters: (x,y,z,vx,vy,vz,t,sx,sy,sz,p) */ @@ -580,10 +581,13 @@ TRACE SAVE %{ // Write to disk - DETECTOR_OUT_2D (this_abs_storage.Detector_2D.title_string, this_abs_storage.Detector_2D.string_axis_1, this_abs_storage.Detector_2D.string_axis_2, - this_abs_storage.Detector_2D.D1min, this_abs_storage.Detector_2D.D1max, this_abs_storage.Detector_2D.D2min, this_abs_storage.Detector_2D.D2max, - this_abs_storage.Detector_2D.bins_1, this_abs_storage.Detector_2D.bins_2, *this_abs_storage.Detector_2D.Array_N, - *this_abs_storage.Detector_2D.Array_p, *this_abs_storage.Detector_2D.Array_p2, this_abs_storage.Detector_2D.Filename); + if (!nowritefile) { + DETECTOR_OUT_2D (this_abs_storage.Detector_2D.title_string, this_abs_storage.Detector_2D.string_axis_1, this_abs_storage.Detector_2D.string_axis_2, + this_abs_storage.Detector_2D.D1min, this_abs_storage.Detector_2D.D1max, this_abs_storage.Detector_2D.D2min, + this_abs_storage.Detector_2D.D2max, this_abs_storage.Detector_2D.bins_1, this_abs_storage.Detector_2D.bins_2, + *this_abs_storage.Detector_2D.Array_N, *this_abs_storage.Detector_2D.Array_p, *this_abs_storage.Detector_2D.Array_p2, + this_abs_storage.Detector_2D.Filename); + } %} FINALLY diff --git a/mcstas-comps/union/Union_abs_logger_1D_space_tof_to_lambda.comp b/mcstas-comps/union/Union_abs_logger_1D_space_tof_to_lambda.comp index 4469011a5a..5dde860950 100644 --- a/mcstas-comps/union/Union_abs_logger_1D_space_tof_to_lambda.comp +++ b/mcstas-comps/union/Union_abs_logger_1D_space_tof_to_lambda.comp @@ -101,6 +101,7 @@ * order_volume: [1] Only log rays that have scattered n times in the same geometry, -1 for all orders * logger_conditional_extend_index: [1] If a conditional is used with this logger, the result of each conditional calculation can be made available in extend as a array called "logger_conditional_extend", and one would then access logger_conditional_extend[n] if logger_conditional_extend_index is set to n * init: [string] Name of Union_init component (typically "init", default) +* nowritefile: [1] If set, logger will skip writing to disk * * CALCULATED PARAMETERS: * @@ -119,7 +120,7 @@ SETTING PARAMETERS(string target_geometry="NULL", lambda_m_min=-1, lambda_m_max=-1, lambda_m_bins=-1, lambda_t_min=-1, lambda_t_max=-1, lambda_t_bins=-1, relative_measured=0, relative_min=0.5, relative_max=1.5, relative_bins=100, - string filename="NULL", order_total=-1, order_volume=-1, logger_conditional_extend_index=-1, string init="init") + string filename="NULL", order_total=-1, order_volume=-1, logger_conditional_extend_index=-1, string init="init", int nowritefile=0) /* Neutron parameters: (x,y,z,vx,vy,vz,t,sx,sy,sz,p) */ @@ -784,10 +785,13 @@ TRACE SAVE %{ // Write to disk - DETECTOR_OUT_2D (this_abs_storage.Detector_2D.title_string, this_abs_storage.Detector_2D.string_axis_1, this_abs_storage.Detector_2D.string_axis_2, - this_abs_storage.Detector_2D.D1min, this_abs_storage.Detector_2D.D1max, this_abs_storage.Detector_2D.D2min, this_abs_storage.Detector_2D.D2max, - this_abs_storage.Detector_2D.bins_1, this_abs_storage.Detector_2D.bins_2, *this_abs_storage.Detector_2D.Array_N, - *this_abs_storage.Detector_2D.Array_p, *this_abs_storage.Detector_2D.Array_p2, this_abs_storage.Detector_2D.Filename); + if (!nowritefile) { + DETECTOR_OUT_2D (this_abs_storage.Detector_2D.title_string, this_abs_storage.Detector_2D.string_axis_1, this_abs_storage.Detector_2D.string_axis_2, + this_abs_storage.Detector_2D.D1min, this_abs_storage.Detector_2D.D1max, this_abs_storage.Detector_2D.D2min, + this_abs_storage.Detector_2D.D2max, this_abs_storage.Detector_2D.bins_1, this_abs_storage.Detector_2D.bins_2, + *this_abs_storage.Detector_2D.Array_N, *this_abs_storage.Detector_2D.Array_p, *this_abs_storage.Detector_2D.Array_p2, + this_abs_storage.Detector_2D.Filename); + } %} FINALLY diff --git a/mcstas-comps/union/Union_abs_logger_1D_time.comp b/mcstas-comps/union/Union_abs_logger_1D_time.comp index 4023fe0cf8..5fac10a8aa 100644 --- a/mcstas-comps/union/Union_abs_logger_1D_time.comp +++ b/mcstas-comps/union/Union_abs_logger_1D_time.comp @@ -71,6 +71,7 @@ * init: [string] name of Union_init component (typically "init", default) * time_min: [s] Minimum time to log * time_max: [s] Maximum time to log +* nowritefile: [1] If set, logger will skip writing to disk * * OUTPUT PARAMETERS: * @@ -85,7 +86,7 @@ DEFINE COMPONENT Union_abs_logger_1D_time DEFINITION PARAMETERS () SETTING PARAMETERS(string target_geometry="NULL", time_min=0, time_max, n=100, - string filename="NULL", order_total=-1, order_volume=-1, logger_conditional_extend_index=-1, string init="init") + string filename="NULL", order_total=-1, order_volume=-1, logger_conditional_extend_index=-1, string init="init", int nowritefile=0) OUTPUT PARAMETERS () /* Neutron parameters: (x,y,z,vx,vy,vz,t,sx,sy,sz,p) */ @@ -503,10 +504,12 @@ TRACE SAVE %{ // Write to disk - DETECTOR_OUT_1D (this_abs_storage.Detector_1D.title_string, this_abs_storage.Detector_1D.string_axis, this_abs_storage.Detector_1D.string_axis_value, - this_abs_storage.Detector_1D.string_axis_short, this_abs_storage.Detector_1D.min, this_abs_storage.Detector_1D.max, - this_abs_storage.Detector_1D.bins, &this_abs_storage.Detector_1D.Array_N[0], &this_abs_storage.Detector_1D.Array_p[0], - &this_abs_storage.Detector_1D.Array_p2[0], this_abs_storage.Detector_1D.Filename); + if (!nowritefile) { + DETECTOR_OUT_1D (this_abs_storage.Detector_1D.title_string, this_abs_storage.Detector_1D.string_axis, this_abs_storage.Detector_1D.string_axis_value, + this_abs_storage.Detector_1D.string_axis_short, this_abs_storage.Detector_1D.min, this_abs_storage.Detector_1D.max, + this_abs_storage.Detector_1D.bins, &this_abs_storage.Detector_1D.Array_N[0], &this_abs_storage.Detector_1D.Array_p[0], + &this_abs_storage.Detector_1D.Array_p2[0], this_abs_storage.Detector_1D.Filename); + } %} FINALLY diff --git a/mcstas-comps/union/Union_abs_logger_2D_space.comp b/mcstas-comps/union/Union_abs_logger_2D_space.comp index 69c24cf643..65cd32a239 100644 --- a/mcstas-comps/union/Union_abs_logger_2D_space.comp +++ b/mcstas-comps/union/Union_abs_logger_2D_space.comp @@ -77,6 +77,7 @@ * order_volume: [1] Only log rays that have scattered n times in the same geometry, -1 for all orders * logger_conditional_extend_index: [1] If a conditional is used with this logger, the result of each conditional calculation can be made available in extend as a array called "logger_conditional_extend", and one would then access logger_conditional_extend[n] if logger_conditional_extend_index is set to n * init: [string] Name of Union_init component (typically "init", default) +* nowritefile: [1] If set, logger will skip writing to disk * * CALCULATED PARAMETERS: * @@ -92,7 +93,7 @@ DEFINE COMPONENT Union_abs_logger_2D_space SETTING PARAMETERS(string target_geometry="NULL", string D_direction_1="x", D1_min=-0.2, D1_max=5, n1=0.2, string D_direction_2="z", D2_min=-0.2, D2_max=5, n2=0.2, - string filename="NULL", order_total=-1, order_volume=-1, logger_conditional_extend_index=-1, string init="init") + string filename="NULL", order_total=-1, order_volume=-1, logger_conditional_extend_index=-1, string init="init", int nowritefile=0) /* Neutron parameters: (x,y,z,vx,vy,vz,t,sx,sy,sz,p) */ @@ -641,10 +642,13 @@ TRACE SAVE %{ // Write to disk - DETECTOR_OUT_2D (this_abs_storage.Detector_2D.title_string, this_abs_storage.Detector_2D.string_axis_1, this_abs_storage.Detector_2D.string_axis_2, - this_abs_storage.Detector_2D.D1min, this_abs_storage.Detector_2D.D1max, this_abs_storage.Detector_2D.D2min, this_abs_storage.Detector_2D.D2max, - this_abs_storage.Detector_2D.bins_1, this_abs_storage.Detector_2D.bins_2, *this_abs_storage.Detector_2D.Array_N, - *this_abs_storage.Detector_2D.Array_p, *this_abs_storage.Detector_2D.Array_p2, this_abs_storage.Detector_2D.Filename); + if (!nowritefile) { + DETECTOR_OUT_2D (this_abs_storage.Detector_2D.title_string, this_abs_storage.Detector_2D.string_axis_1, this_abs_storage.Detector_2D.string_axis_2, + this_abs_storage.Detector_2D.D1min, this_abs_storage.Detector_2D.D1max, this_abs_storage.Detector_2D.D2min, + this_abs_storage.Detector_2D.D2max, this_abs_storage.Detector_2D.bins_1, this_abs_storage.Detector_2D.bins_2, + *this_abs_storage.Detector_2D.Array_N, *this_abs_storage.Detector_2D.Array_p, *this_abs_storage.Detector_2D.Array_p2, + this_abs_storage.Detector_2D.Filename); + } %} FINALLY diff --git a/mcstas-comps/union/Union_abs_logger_event.comp b/mcstas-comps/union/Union_abs_logger_event.comp index 3d325c0f2a..36b4b28b69 100644 --- a/mcstas-comps/union/Union_abs_logger_event.comp +++ b/mcstas-comps/union/Union_abs_logger_event.comp @@ -73,6 +73,7 @@ * ybins: [1] Number of bins along y in logging volume * zbns: [1] Number of bins along z in logging volume * init: [string] Name of Union_init component (typically "init", default) +* nowritefile: [1] If set, logger will skip writing to disk * * CALCULATED PARAMETERS: * @@ -87,7 +88,7 @@ DEFINE COMPONENT Union_abs_logger_event SETTING PARAMETERS(string target_geometry="NULL", string filename="NULL", xwidth=0, xbins=0, yheight=0, ybins=0, zdepth=0, zbins=0, - order_total=-1, order_volume=-1, logger_conditional_extend_index=-1, string init="init") + order_total=-1, order_volume=-1, logger_conditional_extend_index=-1, string init="init", int nowritefile=0) /* Neutron parameters: (x,y,z,vx,vy,vz,t,sx,sy,sz,p) */ @@ -693,7 +694,9 @@ TRACE SAVE %{ - Monitor_nD_Save (&this_abs_storage.DEFS, &this_abs_storage.Vars); + if (!nowritefile) { + Monitor_nD_Save (&this_abs_storage.DEFS, &this_abs_storage.Vars); + } %} FINALLY diff --git a/mcstas-comps/union/Union_abs_logger_nD.comp b/mcstas-comps/union/Union_abs_logger_nD.comp index 939335a3cd..5d3602b3ef 100644 --- a/mcstas-comps/union/Union_abs_logger_nD.comp +++ b/mcstas-comps/union/Union_abs_logger_nD.comp @@ -102,7 +102,7 @@ * username9: [str] Name assigned to User9 * restore_neutron: [0|1] Not functional for Union version * geometry: [str] Name of an OFF file to specify a complex geometry detector -* nowritefile: [1] Not functional for Union version +* nowritefile: [1] If set, logger will skip writing to disk * nexus_bins: [1] NeXus mode only: store component BIN information
(-1 disable, 0 enable for list mode monitor, 1 enable for any montor) * * OUTPUT PARAMETERS: diff --git a/mcstas-comps/union/Union_logger_1D.comp b/mcstas-comps/union/Union_logger_1D.comp index d2a0eccf9b..e859b8893a 100644 --- a/mcstas-comps/union/Union_logger_1D.comp +++ b/mcstas-comps/union/Union_logger_1D.comp @@ -58,6 +58,7 @@ * order_volume_process: [1] Only log rays that scatter for the n'th time in the same geometry, using the same process * logger_conditional_extend_index: [1] If a conditional is used with this logger, the result of each conditional calculation can be made available in extend as a array called "logger_conditional_extend", and one would then acces logger_conditional_extend[n] if logger_conditional_extend_index is set to n * init: [string] Name of Union_init component (typically "init", default) +* nowritefile: [1] If set, logger will skip writing to disk * * CALCULATED PARAMETERS: * @@ -70,7 +71,7 @@ DEFINE COMPONENT Union_logger_1D -SETTING PARAMETERS(string target_geometry="NULL", string target_process="NULL", min_value, max_value, n1=90, string variable="time",string filename="NULL", order_total=0, order_volume=0, order_volume_process=0, logger_conditional_extend_index=-1, string init="init") +SETTING PARAMETERS(string target_geometry="NULL", string target_process="NULL", min_value, max_value, n1=90, string variable="time",string filename="NULL", order_total=0, order_volume=0, order_volume_process=0, logger_conditional_extend_index=-1, string init="init", int nowritefile=0) /* Neutron parameters: (x,y,z,vx,vy,vz,t,sx,sy,sz,p) */ @@ -588,10 +589,12 @@ TRACE SAVE %{ // Write to disk - DETECTOR_OUT_1D (this_storage.Detector_1D.title_string, this_storage.Detector_1D.string_axis, this_storage.Detector_1D.string_axis_value, - this_storage.Detector_1D.string_axis_short, this_storage.Detector_1D.min, this_storage.Detector_1D.max, this_storage.Detector_1D.bins, - &this_storage.Detector_1D.Array_N[0], &this_storage.Detector_1D.Array_p[0], &this_storage.Detector_1D.Array_p2[0], - this_storage.Detector_1D.Filename); + if (!nowritefile) { + DETECTOR_OUT_1D (this_storage.Detector_1D.title_string, this_storage.Detector_1D.string_axis, this_storage.Detector_1D.string_axis_value, + this_storage.Detector_1D.string_axis_short, this_storage.Detector_1D.min, this_storage.Detector_1D.max, this_storage.Detector_1D.bins, + &this_storage.Detector_1D.Array_N[0], &this_storage.Detector_1D.Array_p[0], &this_storage.Detector_1D.Array_p2[0], + this_storage.Detector_1D.Filename); + } %} diff --git a/mcstas-comps/union/Union_logger_2DQ.comp b/mcstas-comps/union/Union_logger_2DQ.comp index 5fbb7104b5..dfbd3bcace 100644 --- a/mcstas-comps/union/Union_logger_2DQ.comp +++ b/mcstas-comps/union/Union_logger_2DQ.comp @@ -60,6 +60,7 @@ * order_volume_process: [1] Only log rays that scatter for the n'th time in the same geometry, uwsing the same process * logger_conditional_extend_index: [1] If a conditional is used with this logger, the result of each conditional calculation can be made available in extend as a array called "logger_conditional_extend", and one would then acces logger_conditional_extend[n] if logger_conditional_extend_index is set to n * init: [string] Name of Union_init component (typically "init", default) +* nowritefile: [1] If set, logger will skip writing to disk * * CALCULATED PARAMETERS: * @@ -76,7 +77,7 @@ SETTING PARAMETERS(string target_geometry="NULL",string target_process="NULL", string Q_direction_1="x", Q1_min=-5,Q1_max=5, n1=90, string Q_direction_2="z", Q2_min=-5,Q2_max=5, n2=90, string filename="NULL", order_total=0, order_volume=0, - order_volume_process=0,logger_conditional_extend_index=-1, string init="init") + order_volume_process=0,logger_conditional_extend_index=-1, string init="init", int nowritefile=0) /* Neutron parameters: (x,y,z,vx,vy,vz,t,sx,sy,sz,p) */ @@ -669,10 +670,12 @@ TRACE SAVE %{ // Write to disk - DETECTOR_OUT_2D (this_storage.Detector_2D.title_string, this_storage.Detector_2D.string_axis_1, this_storage.Detector_2D.string_axis_2, - this_storage.Detector_2D.D1min, this_storage.Detector_2D.D1max, this_storage.Detector_2D.D2min, this_storage.Detector_2D.D2max, - this_storage.Detector_2D.bins_1, this_storage.Detector_2D.bins_2, *this_storage.Detector_2D.Array_N, *this_storage.Detector_2D.Array_p, - *this_storage.Detector_2D.Array_p2, this_storage.Detector_2D.Filename); + if (!nowritefile) { + DETECTOR_OUT_2D (this_storage.Detector_2D.title_string, this_storage.Detector_2D.string_axis_1, this_storage.Detector_2D.string_axis_2, + this_storage.Detector_2D.D1min, this_storage.Detector_2D.D1max, this_storage.Detector_2D.D2min, this_storage.Detector_2D.D2max, + this_storage.Detector_2D.bins_1, this_storage.Detector_2D.bins_2, *this_storage.Detector_2D.Array_N, *this_storage.Detector_2D.Array_p, + *this_storage.Detector_2D.Array_p2, this_storage.Detector_2D.Filename); + } %} FINALLY diff --git a/mcstas-comps/union/Union_logger_2D_kf.comp b/mcstas-comps/union/Union_logger_2D_kf.comp index 1255d5db55..fd8e214138 100644 --- a/mcstas-comps/union/Union_logger_2D_kf.comp +++ b/mcstas-comps/union/Union_logger_2D_kf.comp @@ -61,6 +61,7 @@ * order_volume_process: [1] Only log rays that scatter for the n'th time in the same geometry, using the same process * logger_conditional_extend_index: [1] If a conditional is used with this logger, the result of each conditional calculation can be made available in extend as a array called "logger_conditional_extend", and one would then acces logger_conditional_extend[n] if logger_conditional_extend_index is set to n * init: [string] Name of Union_init component (typically "init", default) +* nowritefile: [1] If set, logger will skip writing to disk * * CALCULATED PARAMETERS: * @@ -73,7 +74,7 @@ DEFINE COMPONENT Union_logger_2D_kf -SETTING PARAMETERS(string target_geometry="NULL",string target_process="NULL", Q1_min=-5, Q1_max=5, Q2_min=-5, Q2_max=5, string Q_direction_1="x", string Q_direction_2="z",string filename="NULL", n1=90, n2=90, order_total=0,order_volume=0,order_volume_process=0,logger_conditional_extend_index=-1, string init="init") +SETTING PARAMETERS(string target_geometry="NULL",string target_process="NULL", Q1_min=-5, Q1_max=5, Q2_min=-5, Q2_max=5, string Q_direction_1="x", string Q_direction_2="z",string filename="NULL", n1=90, n2=90, order_total=0,order_volume=0,order_volume_process=0,logger_conditional_extend_index=-1, string init="init", int nowritefile=0) /* Neutron parameters: (x,y,z,vx,vy,vz,t,sx,sy,sz,p) */ @@ -671,10 +672,12 @@ TRACE SAVE %{ // Write to disk - DETECTOR_OUT_2D (this_storage.Detector_2D.title_string, this_storage.Detector_2D.string_axis_1, this_storage.Detector_2D.string_axis_2, - this_storage.Detector_2D.D1min, this_storage.Detector_2D.D1max, this_storage.Detector_2D.D2min, this_storage.Detector_2D.D2max, - this_storage.Detector_2D.bins_1, this_storage.Detector_2D.bins_2, *this_storage.Detector_2D.Array_N, *this_storage.Detector_2D.Array_p, - *this_storage.Detector_2D.Array_p2, this_storage.Detector_2D.Filename); + if (!nowritefile) { + DETECTOR_OUT_2D (this_storage.Detector_2D.title_string, this_storage.Detector_2D.string_axis_1, this_storage.Detector_2D.string_axis_2, + this_storage.Detector_2D.D1min, this_storage.Detector_2D.D1max, this_storage.Detector_2D.D2min, this_storage.Detector_2D.D2max, + this_storage.Detector_2D.bins_1, this_storage.Detector_2D.bins_2, *this_storage.Detector_2D.Array_N, *this_storage.Detector_2D.Array_p, + *this_storage.Detector_2D.Array_p2, this_storage.Detector_2D.Filename); + } %} FINALLY diff --git a/mcstas-comps/union/Union_logger_2D_kf_time.comp b/mcstas-comps/union/Union_logger_2D_kf_time.comp index 2e13a9d533..a7a22f20d3 100644 --- a/mcstas-comps/union/Union_logger_2D_kf_time.comp +++ b/mcstas-comps/union/Union_logger_2D_kf_time.comp @@ -65,6 +65,7 @@ * order_volume_process: [1] Only log rays that scatter for the n'th time in the same geometry, using the same process * logger_conditional_extend_index: [1] If a conditional is used with this logger, the result of each conditional calculation can be made available in extend as a array called "logger_conditional_extend", and one would then acces logger_conditional_extend[n] if logger_conditional_extend_index is set to n * init: [string] Name of Union_init component (typically "init", default) +* nowritefile: [1] If set, logger will skip writing to disk * * CALCULATED PARAMETERS: * @@ -77,7 +78,7 @@ DEFINE COMPONENT Union_logger_2D_kf_time -SETTING PARAMETERS(string target_geometry="NULL",string target_process="NULL", Q1_min=-5, Q1_max=5, Q2_min=-5, Q2_max=5, time_min=0, time_max=1,string Q_direction_1="x", string Q_direction_2="z",string filename="NULL", n1=90, n2=90, time_bins=10, order_total=0,order_volume=0,order_volume_process=0,logger_conditional_extend_index=-1, string init="init") +SETTING PARAMETERS(string target_geometry="NULL",string target_process="NULL", Q1_min=-5, Q1_max=5, Q2_min=-5, Q2_max=5, time_min=0, time_max=1,string Q_direction_1="x", string Q_direction_2="z",string filename="NULL", n1=90, n2=90, time_bins=10, order_total=0,order_volume=0,order_volume_process=0,logger_conditional_extend_index=-1, string init="init", int nowritefile=0) /* Neutron parameters: (x,y,z,vx,vy,vz,t,sx,sy,sz,p) */ @@ -319,8 +320,7 @@ SHARE [storage->temp_2D_kf_t_data.elements[index].index_3]++; storage->Detector_3D.Array_p[storage->temp_2D_kf_t_data.elements[index].index_1][storage->temp_2D_kf_t_data.elements[index].index_2] - [storage->temp_2D_kf_t_data.elements[index].index_3] - += storage->temp_2D_kf_t_data.elements[index].weight; + [storage->temp_2D_kf_t_data.elements[index].index_3] += storage->temp_2D_kf_t_data.elements[index].weight; storage->Detector_3D.Array_p2[storage->temp_2D_kf_t_data.elements[index].index_1][storage->temp_2D_kf_t_data.elements[index].index_2] [storage->temp_2D_kf_t_data.elements[index].index_3] @@ -343,12 +343,10 @@ SHARE [storage->temp_2D_kf_t_data.elements[index].index_3]++; storage->Detector_3D.Array_p[storage->temp_2D_kf_t_data.elements[index].index_1][storage->temp_2D_kf_t_data.elements[index].index_2] - [storage->temp_2D_kf_t_data.elements[index].index_3] - += final_weight; + [storage->temp_2D_kf_t_data.elements[index].index_3] += final_weight; storage->Detector_3D.Array_p2[storage->temp_2D_kf_t_data.elements[index].index_1][storage->temp_2D_kf_t_data.elements[index].index_2] - [storage->temp_2D_kf_t_data.elements[index].index_3] - += final_weight * final_weight; + [storage->temp_2D_kf_t_data.elements[index].index_3] += final_weight * final_weight; } clear_temp_2D_kf_t (data_union); } @@ -744,14 +742,16 @@ SAVE %{ // Write to disk - for (loop_index = 0; loop_index < this_storage.Detector_3D.bins_3; loop_index++) { - sprintf (number_string, "%d", loop_index); - sprintf (part_filename, "%s_%s", this_storage.Detector_3D.Filename, number_string); + if (!nowritefile) { + for (loop_index = 0; loop_index < this_storage.Detector_3D.bins_3; loop_index++) { + sprintf (number_string, "%d", loop_index); + sprintf (part_filename, "%s_%s", this_storage.Detector_3D.Filename, number_string); - DETECTOR_OUT_2D (this_storage.Detector_3D.title_string, this_storage.Detector_3D.string_axis_1, this_storage.Detector_3D.string_axis_2, - this_storage.Detector_3D.D1min, this_storage.Detector_3D.D1max, this_storage.Detector_3D.D2min, this_storage.Detector_3D.D2max, - this_storage.Detector_3D.bins_1, this_storage.Detector_3D.bins_2, &this_storage.Detector_3D.Array_N[loop_index][0][0], - &this_storage.Detector_3D.Array_p[loop_index][0][0], &this_storage.Detector_3D.Array_p2[loop_index][0][0], part_filename); + DETECTOR_OUT_2D (this_storage.Detector_3D.title_string, this_storage.Detector_3D.string_axis_1, this_storage.Detector_3D.string_axis_2, + this_storage.Detector_3D.D1min, this_storage.Detector_3D.D1max, this_storage.Detector_3D.D2min, this_storage.Detector_3D.D2max, + this_storage.Detector_3D.bins_1, this_storage.Detector_3D.bins_2, &this_storage.Detector_3D.Array_N[loop_index][0][0], + &this_storage.Detector_3D.Array_p[loop_index][0][0], &this_storage.Detector_3D.Array_p2[loop_index][0][0], part_filename); + } } %} diff --git a/mcstas-comps/union/Union_logger_2D_space.comp b/mcstas-comps/union/Union_logger_2D_space.comp index b6e6353ae8..5ca1c7d43f 100644 --- a/mcstas-comps/union/Union_logger_2D_space.comp +++ b/mcstas-comps/union/Union_logger_2D_space.comp @@ -62,6 +62,7 @@ * order_volume_process: [1] Only log rays that scatter for the n'th time in the same geometry, using the same process * logger_conditional_extend_index: [1] If a conditional is used with this logger, the result of each conditional calculation can be made available in extend as a array called "logger_conditional_extend", and one would then acces logger_conditional_extend[n] if logger_conditional_extend_index is set to n * init: [string] Name of Union_init component (typically "init", default) +* nowritefile: [1] If set, logger will skip writing to disk * * CALCULATED PARAMETERS: * @@ -77,7 +78,7 @@ DEFINE COMPONENT Union_logger_2D_space SETTING PARAMETERS(string target_geometry="NULL", string target_process="NULL", string D_direction_1="x", D1_min=-5, D1_max=5, n1=90, string D_direction_2="z", D2_min=-5, D2_max=5, n2=90, - string filename="NULL", order_total=0, order_volume=0, order_volume_process=0, logger_conditional_extend_index=-1, string init="init") + string filename="NULL", order_total=0, order_volume=0, order_volume_process=0, logger_conditional_extend_index=-1, string init="init", int nowritefile=0) /* Neutron parameters: (x,y,z,vx,vy,vz,t,sx,sy,sz,p) */ @@ -704,10 +705,12 @@ TRACE SAVE %{ // Write to disk - DETECTOR_OUT_2D (this_storage.Detector_2D.title_string, this_storage.Detector_2D.string_axis_1, this_storage.Detector_2D.string_axis_2, - this_storage.Detector_2D.D1min, this_storage.Detector_2D.D1max, this_storage.Detector_2D.D2min, this_storage.Detector_2D.D2max, - this_storage.Detector_2D.bins_1, this_storage.Detector_2D.bins_2, *this_storage.Detector_2D.Array_N, *this_storage.Detector_2D.Array_p, - *this_storage.Detector_2D.Array_p2, this_storage.Detector_2D.Filename); + if (!nowritefile) { + DETECTOR_OUT_2D (this_storage.Detector_2D.title_string, this_storage.Detector_2D.string_axis_1, this_storage.Detector_2D.string_axis_2, + this_storage.Detector_2D.D1min, this_storage.Detector_2D.D1max, this_storage.Detector_2D.D2min, this_storage.Detector_2D.D2max, + this_storage.Detector_2D.bins_1, this_storage.Detector_2D.bins_2, *this_storage.Detector_2D.Array_N, *this_storage.Detector_2D.Array_p, + *this_storage.Detector_2D.Array_p2, this_storage.Detector_2D.Filename); + } %} FINALLY diff --git a/mcstas-comps/union/Union_logger_2D_space_time.comp b/mcstas-comps/union/Union_logger_2D_space_time.comp index 30186e9127..fbae255ee8 100644 --- a/mcstas-comps/union/Union_logger_2D_space_time.comp +++ b/mcstas-comps/union/Union_logger_2D_space_time.comp @@ -65,6 +65,7 @@ * order_volume_process: [1] Only log rays that scatter for the n'th time in the same geometry, using the same process * logger_conditional_extend_index: [1] If a conditional is used with this logger, the result of each conditional calculation can be made available in extend as a array called "logger_conditional_extend", and one would then acces logger_conditional_extend[n] if logger_conditional_extend_index is set to n * init: [string] Name of Union_init component (typically "init", default) +* nowritefile: [1] If set, logger will skip writing to disk * * CALCULATED PARAMETERS: * @@ -77,7 +78,7 @@ DEFINE COMPONENT Union_logger_2D_space_time -SETTING PARAMETERS(string target_geometry="NULL",string target_process="NULL",D1_min=-5,D1_max=5,D2_min=-5,D2_max=5,time_min=0,time_max=1,string D_direction_1="x", string D_direction_2="z",string filename="NULL", n1=90, n2=90, time_bins=10, order_total=0,order_volume=0,order_volume_process=0,logger_conditional_extend_index=-1, string init="init") +SETTING PARAMETERS(string target_geometry="NULL",string target_process="NULL",D1_min=-5,D1_max=5,D2_min=-5,D2_max=5,time_min=0,time_max=1,string D_direction_1="x", string D_direction_2="z",string filename="NULL", n1=90, n2=90, time_bins=10, order_total=0,order_volume=0,order_volume_process=0,logger_conditional_extend_index=-1, string init="init", int nowritefile=0) /* Neutron parameters: (x,y,z,vx,vy,vz,t,sx,sy,sz,p) */ @@ -339,8 +340,7 @@ SHARE [storage->temp_2DS_t_data.elements[index].index_3]++; storage->Detector_3D.Array_p[storage->temp_2DS_t_data.elements[index].index_1][storage->temp_2DS_t_data.elements[index].index_2] - [storage->temp_2DS_t_data.elements[index].index_3] - += storage->temp_2DS_t_data.elements[index].weight; + [storage->temp_2DS_t_data.elements[index].index_3] += storage->temp_2DS_t_data.elements[index].weight; storage->Detector_3D.Array_p2[storage->temp_2DS_t_data.elements[index].index_1][storage->temp_2DS_t_data.elements[index].index_2] [storage->temp_2DS_t_data.elements[index].index_3] @@ -363,12 +363,10 @@ SHARE [storage->temp_2DS_t_data.elements[index].index_3]++; storage->Detector_3D.Array_p[storage->temp_2DS_t_data.elements[index].index_1][storage->temp_2DS_t_data.elements[index].index_2] - [storage->temp_2DS_t_data.elements[index].index_3] - += final_weight; + [storage->temp_2DS_t_data.elements[index].index_3] += final_weight; storage->Detector_3D.Array_p2[storage->temp_2DS_t_data.elements[index].index_1][storage->temp_2DS_t_data.elements[index].index_2] - [storage->temp_2DS_t_data.elements[index].index_3] - += final_weight; + [storage->temp_2DS_t_data.elements[index].index_3] += final_weight; } clear_temp_2DS_t (data_union); } @@ -767,14 +765,16 @@ SAVE %{ // Write to disk - for (loop_index = 0; loop_index < this_storage.Detector_3D.bins_3; loop_index++) { - sprintf (number_string, "%d", loop_index); - sprintf (part_filename, "%s_%s", this_storage.Detector_3D.Filename, number_string); + if (!nowritefile) { + for (loop_index = 0; loop_index < this_storage.Detector_3D.bins_3; loop_index++) { + sprintf (number_string, "%d", loop_index); + sprintf (part_filename, "%s_%s", this_storage.Detector_3D.Filename, number_string); - DETECTOR_OUT_2D (this_storage.Detector_3D.title_string, this_storage.Detector_3D.string_axis_1, this_storage.Detector_3D.string_axis_2, - this_storage.Detector_3D.D1min, this_storage.Detector_3D.D1max, this_storage.Detector_3D.D2min, this_storage.Detector_3D.D2max, - this_storage.Detector_3D.bins_1, this_storage.Detector_3D.bins_2, &this_storage.Detector_3D.Array_N[loop_index][0][0], - &this_storage.Detector_3D.Array_p[loop_index][0][0], &this_storage.Detector_3D.Array_p2[loop_index][0][0], part_filename); + DETECTOR_OUT_2D (this_storage.Detector_3D.title_string, this_storage.Detector_3D.string_axis_1, this_storage.Detector_3D.string_axis_2, + this_storage.Detector_3D.D1min, this_storage.Detector_3D.D1max, this_storage.Detector_3D.D2min, this_storage.Detector_3D.D2max, + this_storage.Detector_3D.bins_1, this_storage.Detector_3D.bins_2, &this_storage.Detector_3D.Array_N[loop_index][0][0], + &this_storage.Detector_3D.Array_p[loop_index][0][0], &this_storage.Detector_3D.Array_p2[loop_index][0][0], part_filename); + } } %} diff --git a/mcstas-comps/union/Union_logger_3D_space.comp b/mcstas-comps/union/Union_logger_3D_space.comp index cc6980e428..ebf20ae88b 100644 --- a/mcstas-comps/union/Union_logger_3D_space.comp +++ b/mcstas-comps/union/Union_logger_3D_space.comp @@ -67,6 +67,7 @@ * order_volume_process: [1] Only log rays that scatter for the n'th time in the same geometry, using the same process * logger_conditional_extend_index: [1] If a conditional is used with this logger, the result of each conditional calculation can be made available in extend as a array called "logger_conditional_extend", and one would then acces logger_conditional_extend[n] if logger_conditional_extend_index is set to n * init: [string] name of Union_init component (typically "init", default) +* nowritefile: [1] If set, logger will skip writing to disk * * CALCULATED PARAMETERS: * @@ -79,7 +80,7 @@ DEFINE COMPONENT Union_logger_3D_space -SETTING PARAMETERS(string target_geometry="NULL",string target_process="NULL",D1_min=-1,D1_max=1,D2_min=-1,D2_max=1,D3_min=-1,D3_max=1,string D_direction_1="x", string D_direction_2="z", string D_direction_3="z",string filename="NULL", n1=90, n2=90, n3=10, order_total=0,order_volume=0,order_volume_process=0,logger_conditional_extend_index=-1, string init="init") +SETTING PARAMETERS(string target_geometry="NULL",string target_process="NULL",D1_min=-1,D1_max=1,D2_min=-1,D2_max=1,D3_min=-1,D3_max=1,string D_direction_1="x", string D_direction_2="z", string D_direction_3="z",string filename="NULL", n1=90, n2=90, n3=10, order_total=0,order_volume=0,order_volume_process=0,logger_conditional_extend_index=-1, string init="init", int nowritefile=0) /* Neutron parameters: (x,y,z,vx,vy,vz,t,sx,sy,sz,p) */ @@ -395,8 +396,7 @@ SHARE += final_weight; storage->Detector_3D.Array_p2[storage->temp_3DS_data.elements[index].index_1][storage->temp_3DS_data.elements[index].index_2] - [storage->temp_3DS_data.elements[index].index_3] - += final_weight * final_weight; + [storage->temp_3DS_data.elements[index].index_3] += final_weight * final_weight; } clear_temp_3DS (data_union); } @@ -828,14 +828,16 @@ SAVE %{ // Write to disk - for (loop_index = 0; loop_index < this_storage.Detector_3D.bins_3; loop_index++) { - sprintf (number_string, "%d", loop_index); - sprintf (part_filename, "%s_%s", this_storage.Detector_3D.Filename, number_string); + if (!nowritefile) { + for (loop_index = 0; loop_index < this_storage.Detector_3D.bins_3; loop_index++) { + sprintf (number_string, "%d", loop_index); + sprintf (part_filename, "%s_%s", this_storage.Detector_3D.Filename, number_string); - DETECTOR_OUT_2D (this_storage.Detector_3D.title_string, this_storage.Detector_3D.string_axis_1, this_storage.Detector_3D.string_axis_2, - this_storage.Detector_3D.D1min, this_storage.Detector_3D.D1max, this_storage.Detector_3D.D2min, this_storage.Detector_3D.D2max, - this_storage.Detector_3D.bins_1, this_storage.Detector_3D.bins_2, &this_storage.Detector_3D.Array_N[loop_index][0][0], - &this_storage.Detector_3D.Array_p[loop_index][0][0], &this_storage.Detector_3D.Array_p2[loop_index][0][0], part_filename); + DETECTOR_OUT_2D (this_storage.Detector_3D.title_string, this_storage.Detector_3D.string_axis_1, this_storage.Detector_3D.string_axis_2, + this_storage.Detector_3D.D1min, this_storage.Detector_3D.D1max, this_storage.Detector_3D.D2min, this_storage.Detector_3D.D2max, + this_storage.Detector_3D.bins_1, this_storage.Detector_3D.bins_2, &this_storage.Detector_3D.Array_N[loop_index][0][0], + &this_storage.Detector_3D.Array_p[loop_index][0][0], &this_storage.Detector_3D.Array_p2[loop_index][0][0], part_filename); + } } %}