From d65ba595c31b76d9defad2aa85145b78a0005789 Mon Sep 17 00:00:00 2001 From: Yuichi Motoyama Date: Wed, 13 Mar 2024 15:25:08 +0900 Subject: [PATCH] update samples --- .../many_beam/mapper_weight_calc/input.toml | 19 ++++-------------- .../mapper_weight_calc/ref_ColorMap.txt | 6 +++--- .../many_beam/mapper_weight_manual/input.toml | 18 ++++------------- .../mapper_weight_manual/ref_ColorMap.txt | 4 ++-- .../minsearch_weight_calc/input.toml | 15 ++++---------- .../many_beam/minsearch_weight_calc/ref.txt | 20 +++++++++---------- .../minsearch_weight_manual/input.toml | 17 ++++------------ .../many_beam/minsearch_weight_manual/ref.txt | 20 +++++++++---------- 8 files changed, 41 insertions(+), 78 deletions(-) diff --git a/sample/sim-trhepd-rheed/many_beam/mapper_weight_calc/input.toml b/sample/sim-trhepd-rheed/many_beam/mapper_weight_calc/input.toml index 228104b8..6e709c73 100644 --- a/sample/sim-trhepd-rheed/many_beam/mapper_weight_calc/input.toml +++ b/sample/sim-trhepd-rheed/many_beam/mapper_weight_calc/input.toml @@ -3,37 +3,26 @@ dimension = 9 output_dir = "output" [solver] -name = "sim-trhepd-rheed-mb_connect" +name = "sim-trhepd-rheed" run_scheme = "subprocess" generate_rocking_curve = false [solver.config] -#calculated_first_line =5 -#calculated_last_line = 65 -#row_number = 2 -surface_exec_file = "~/tool/sim-trhepd-rheed/src/surf.exe" -bulk_output_file = "bulkP.b" -surface_template_file = "template.txt" cal_number = [1, 2, 4, 6, 8] - [solver.post] -normalization = "MS_NORM" #"TOTAL" for Integration or "MAX" for MAX value -Rfactor_type = "A2" #"A" for Ichimiya's or "B" for Pendry's or "A2" for squared Weight + Ichimiya's +normalization = "MANY_BEAM" +weight_type = "calc" +Rfactor_type = "A2" omega = 0.5 remove_work_dir = false [solver.param] string_list = ["value_01", "value_02","value_03", "value_04","value_05", "value_06", "value_07","value_08", "value_09"] -#degree_max = 6.5 - [solver.reference] path = "experiment.txt" exp_number = [1, 2, 4, 6, 8] -#first =1 -#last = 63 - [algorithm] name = "mapper" diff --git a/sample/sim-trhepd-rheed/many_beam/mapper_weight_calc/ref_ColorMap.txt b/sample/sim-trhepd-rheed/many_beam/mapper_weight_calc/ref_ColorMap.txt index 81dd323e..ac721f98 100644 --- a/sample/sim-trhepd-rheed/many_beam/mapper_weight_calc/ref_ColorMap.txt +++ b/sample/sim-trhepd-rheed/many_beam/mapper_weight_calc/ref_ColorMap.txt @@ -4,7 +4,7 @@ 5.000000 4.000000 5.000000 5.000000 5.000000 5.000000 5.000000 5.000000 5.000000 0.001807 5.000000 5.000000 4.000000 5.000000 5.000000 5.000000 5.000000 5.000000 5.000000 0.001808 5.000000 5.000000 5.000000 4.000000 5.000000 5.000000 5.000000 5.000000 5.000000 0.001948 -5.000000 5.000000 5.000000 5.000000 4.000000 5.000000 5.000000 5.000000 5.000000 0.002115 -5.000000 5.000000 5.000000 5.000000 5.000000 4.000000 5.000000 5.000000 5.000000 0.002115 +5.000000 5.000000 5.000000 5.000000 4.000000 5.000000 5.000000 5.000000 5.000000 0.002116 +5.000000 5.000000 5.000000 5.000000 5.000000 4.000000 5.000000 5.000000 5.000000 0.002116 5.000000 5.000000 5.000000 5.000000 5.000000 5.000000 4.000000 5.000000 5.000000 0.002114 -5.000000 5.000000 5.000000 5.000000 5.000000 5.000000 5.000000 4.000000 5.000000 0.001927 +5.000000 5.000000 5.000000 5.000000 5.000000 5.000000 5.000000 4.000000 5.000000 0.001926 diff --git a/sample/sim-trhepd-rheed/many_beam/mapper_weight_manual/input.toml b/sample/sim-trhepd-rheed/many_beam/mapper_weight_manual/input.toml index d1aef925..fb533809 100644 --- a/sample/sim-trhepd-rheed/many_beam/mapper_weight_manual/input.toml +++ b/sample/sim-trhepd-rheed/many_beam/mapper_weight_manual/input.toml @@ -3,37 +3,27 @@ dimension = 9 output_dir = "output" [solver] -name = "sim-trhepd-rheed-mb_connect" +name = "sim-trhepd-rheed" run_scheme = "subprocess" generate_rocking_curve = false [solver.config] -#calculated_first_line =5 -#calculated_last_line = 65 -#row_number = 2 -surface_exec_file = "~/tool/sim-trhepd-rheed/src/surf.exe" -bulk_output_file = "bulkP.b" -surface_template_file = "template.txt" cal_number = [1, 2, 4, 6, 8] - [solver.post] -normalization = "MS_NORM_SET_WGT" #"TOTAL" for Integration or "MAX" for MAX value -Rfactor_type = "A2" #"A" for Ichimiya's or "B" for Pendry's or "A2" for squared Weight + Ichimiya's +normalization = "MANY_BEAM" +weight_type = "manual" +Rfactor_type = "A2" omega = 0.5 spot_weight = [0.933, 0.026, 0.036, 0.003, 0.002] remove_work_dir = false [solver.param] string_list = ["value_01", "value_02","value_03", "value_04","value_05", "value_06", "value_07","value_08", "value_09"] -#degree_max = 6.5 - [solver.reference] path = "experiment.txt" exp_number = [1, 2, 4, 6, 8] -#first =1 -#last = 63 [algorithm] diff --git a/sample/sim-trhepd-rheed/many_beam/mapper_weight_manual/ref_ColorMap.txt b/sample/sim-trhepd-rheed/many_beam/mapper_weight_manual/ref_ColorMap.txt index 46550f5a..2e407790 100644 --- a/sample/sim-trhepd-rheed/many_beam/mapper_weight_manual/ref_ColorMap.txt +++ b/sample/sim-trhepd-rheed/many_beam/mapper_weight_manual/ref_ColorMap.txt @@ -6,5 +6,5 @@ 5.000000 5.000000 5.000000 4.000000 5.000000 5.000000 5.000000 5.000000 5.000000 0.003431 5.000000 5.000000 5.000000 5.000000 4.000000 5.000000 5.000000 5.000000 5.000000 0.003575 5.000000 5.000000 5.000000 5.000000 5.000000 4.000000 5.000000 5.000000 5.000000 0.003575 -5.000000 5.000000 5.000000 5.000000 5.000000 5.000000 4.000000 5.000000 5.000000 0.003571 -5.000000 5.000000 5.000000 5.000000 5.000000 5.000000 5.000000 4.000000 5.000000 0.004136 +5.000000 5.000000 5.000000 5.000000 5.000000 5.000000 4.000000 5.000000 5.000000 0.003572 +5.000000 5.000000 5.000000 5.000000 5.000000 5.000000 5.000000 4.000000 5.000000 0.004135 diff --git a/sample/sim-trhepd-rheed/many_beam/minsearch_weight_calc/input.toml b/sample/sim-trhepd-rheed/many_beam/minsearch_weight_calc/input.toml index 2a7df8bc..b1ecbf09 100644 --- a/sample/sim-trhepd-rheed/many_beam/minsearch_weight_calc/input.toml +++ b/sample/sim-trhepd-rheed/many_beam/minsearch_weight_calc/input.toml @@ -3,34 +3,27 @@ dimension = 9 output_dir = "output" [solver] -name = "sim-trhepd-rheed-mb_connect" +name = "sim-trhepd-rheed" run_scheme = "subprocess" [solver.config] -surface_exec_file = "/home/kinoshita/tool/sim-trhepd-rheed/src/surf.exe" -bulk_output_file = "bulkP.b" surface_template_file = "template.txt" cal_number = [1, 2, 4, 6, 8] -#calculated_first_line =5 -#calculated_last_line = 67 -#row_number = 2 [solver.post] -normalization = "MS_NORM" #"TOTAL" for Integration or "MAX" for MAX value -Rfactor_type = "A2" #"A" for Ichimiya's or "B" for Pendry's or "A2" for squared Weight + Ichimiya's +normalization = "MANY_BEAM" +weight_type = "calc" +Rfactor_type = "A2" omega = 0.5 remove_work_dir = false [solver.param] string_list = ["value_01", "value_02", "value_03", "value_04", "value_05", "value_06", "value_07", "value_08", "value_09"] -#degree_max = 6.5 [solver.reference] path = "experiment.txt" exp_number = [1, 2, 4, 6, 8] -#first =1 -#last = 63 [algorithm] name = "minsearch" diff --git a/sample/sim-trhepd-rheed/many_beam/minsearch_weight_calc/ref.txt b/sample/sim-trhepd-rheed/many_beam/minsearch_weight_calc/ref.txt index cf49da3f..c9d084e1 100644 --- a/sample/sim-trhepd-rheed/many_beam/minsearch_weight_calc/ref.txt +++ b/sample/sim-trhepd-rheed/many_beam/minsearch_weight_calc/ref.txt @@ -1,10 +1,10 @@ -fx = 6.3938405423961675e-09 -X1 = 0.5004690263563492 -X2 = 0.9864825395902956 -X3 = 1.500736054255837 -Y3 = 1.49846022838361 -Z1 = 5.401681359233681 -Z2 = 4.801963397208427 -Z3 = 3.8008746121421977 -Z4 = 2.1004447161065523 -Z5 = 2.000919674433793 +fx = 5.870697010213283e-08 +X1 = 0.498650640494334 +X2 = 0.9822705097865176 +X3 = 1.4991812067698258 +Y3 = 1.4907709351352652 +Z1 = 5.398695624404391 +Z2 = 4.799987213886201 +Z3 = 3.7972188118825647 +Z4 = 2.0996559741875735 +Z5 = 1.9977261612753727 diff --git a/sample/sim-trhepd-rheed/many_beam/minsearch_weight_manual/input.toml b/sample/sim-trhepd-rheed/many_beam/minsearch_weight_manual/input.toml index 9cb34532..7263dace 100644 --- a/sample/sim-trhepd-rheed/many_beam/minsearch_weight_manual/input.toml +++ b/sample/sim-trhepd-rheed/many_beam/minsearch_weight_manual/input.toml @@ -3,35 +3,26 @@ dimension = 9 output_dir = "output" [solver] -name = "sim-trhepd-rheed-mb_connect" +name = "sim-trhepd-rheed" run_scheme = "subprocess" [solver.config] -surface_exec_file = "/home/kinoshita/tool/sim-trhepd-rheed/src/surf.exe" -bulk_output_file = "bulkP.b" -surface_template_file = "template.txt" cal_number = [1, 2, 4, 6, 8] -#calculated_first_line =5 -#calculated_last_line = 67 -#row_number = 2 [solver.post] -normalization = "MS_NORM_SET_WGT" #"TOTAL" for Integration or "MAX" for MAX value -Rfactor_type = "A2" #"A" for Ichimiya's or "B" for Pendry's or "A2" for squared Weight + Ichimiya's +normalization = "MANY_BEAM" +weight_type = "manual" +Rfactor_type = "A2" omega = 0.5 spot_weight = [0.933, 0.026, 0.036, 0.003, 0.002] - remove_work_dir = false [solver.param] string_list = ["value_01", "value_02", "value_03", "value_04", "value_05", "value_06", "value_07", "value_08", "value_09"] -#degree_max = 6.5 [solver.reference] path = "experiment.txt" exp_number = [1, 2, 4, 6, 8] -#first =1 -#last = 63 [algorithm] name = "minsearch" diff --git a/sample/sim-trhepd-rheed/many_beam/minsearch_weight_manual/ref.txt b/sample/sim-trhepd-rheed/many_beam/minsearch_weight_manual/ref.txt index 55016479..ad4880f3 100644 --- a/sample/sim-trhepd-rheed/many_beam/minsearch_weight_manual/ref.txt +++ b/sample/sim-trhepd-rheed/many_beam/minsearch_weight_manual/ref.txt @@ -1,10 +1,10 @@ -fx = 9.03877847229974e-09 -X1 = 0.5005020046725166 -X2 = 0.98869323286312 -X3 = 1.5004206807677547 -Y3 = 1.4982051821768732 -Z1 = 5.400768705712512 -Z2 = 4.800786853391697 -Z3 = 3.800378633792033 -Z4 = 2.1001028103351684 -Z5 = 2.0002811485701972 +fx = 9.684683478274124e-08 +X1 = 0.49970406829335623 +X2 = 0.9796143149174499 +X3 = 1.500705963094981 +Y3 = 1.4926927133991343 +Z1 = 5.400986081124994 +Z2 = 4.802368383158388 +Z3 = 3.7993453437242017 +Z4 = 2.0993664537497496 +Z5 = 2.0001418106152284