Merge pull request #708 from beomki-yeo/state-name-of-field

State name of field and material in the plots

Author: beomki-yeo

tests/integration_tests/cpu/propagator/jacobian_validation.cpp

@@ -1496,8 +1496,6 @@ int main(int argc, char** argv) {
     mt1.seed(mc_seed);
 
     // Volume material
-    // const material<scalar> volume_mat = detray::silicon<scalar>();
-    // const material<scalar> volume_mat = detray::iron_with_ded<scalar>();
     const material<scalar> volume_mat =
         detray::cesium_iodide_with_ded<scalar>();
 

tests/validation/root/covariance_validation.C

@@ -33,22 +33,23 @@ namespace {
 double x_pos = 0.205f;
 double title_x = x_pos;
 double title_y = 0.8197f;
-double y_gap = -0.05;
+double y_gap = -0.0505;
 double header_text_size = 0.055;
-double geom_text_size = 0.0416667;
+double geom_text_size = 0.0434028;
 
 double pull_fit_title_x = x_pos;
-double pull_fit_title_y = 0.701f;
+double pull_fit_title_y = 0.700f;
 double pval_fit_title_x = x_pos;
-double pval_fit_title_y = 0.701f;
+double pval_fit_title_y = 0.700f;
 double gaus_fit_par_x = x_pos;
-double gaus_fit_par_y = pull_fit_title_y - 0.064;
+double number_offset = 0.125;
+double gaus_fit_par_y = pull_fit_title_y - 0.065;
 double const_fit_par_x = x_pos;
-double const_fit_par_y = pval_fit_title_y - 0.0449;
+double const_fit_par_y = pval_fit_title_y - 0.0459;
 double tolerance_x = 0.7f;
 double tolerance_y = 0.67f;
-double pull_text_size = 0.0416667;
-double pval_text_size = 0.0416667;
+double pull_text_size = 0.0434028;
+double pval_text_size = 0.0434028;
 double pad_x0 = 0.00f;
 double pad_x1 = 1.f;
 double pad_y0 = 0.00f;
@@ -217,7 +218,7 @@ void draw_gaus_fit_par(const std::array<double, 3u>& fit_par,
     sigma_stream << std::fixed << std::setprecision(3) << fit_par[2] << " #pm "
                  << fit_par_error[2];
 
-    TLatex* ttext2 = new TLatex(x + 0.11, y,
+    TLatex* ttext2 = new TLatex(x + number_offset, y,
                                 "#splitline{" + TString(mean_stream.str()) +
                                     "}{" + TString(sigma_stream.str()) + "}");
     ttext2->SetTextFont(132);
@@ -575,8 +576,7 @@ void covariance_validation() {
 
     const std::string rect_title = "Bound-to-bound transport";
     const std::string wire_title = "Perigee-to-perigee transport";
-    const std::string geom_title =
-        "RKN with an inhomogeneous field and a material";
+    const std::string geom_title = "RKN with the ODD magnetic field and CsI";
 
     /************************
      *  Rectangular

tests/validation/root/jacobian_comparison.C

@@ -34,7 +34,7 @@ double labely_offset = 0.01;
 double title_font_size = 0.055;
 double title_offset = 0.71;
 double marker_size = 1.3875;
-double legend_margin = 0.115;
+double legend_margin = 0.12;
 int title_font = 132;
 int label_font = 132;
 int legend_font = 132;
@@ -43,7 +43,7 @@ double y_min = -15;
 double y_max = 10;
 double y_margin = 0;
 double header_size = 0.05;
-std::array<float, 4> ldim{0.54424, 0.621849, 0.942404, 0.880252};
+std::array<float, 4> ldim{0.587646, 0.62395, 0.942404, 0.880252};
 double pad_x0 = 0.00;
 double pad_x1 = 1;
 double pad_y0 = 0.00;
@@ -299,33 +299,35 @@ void jacobian_comparison() {
     rect_legend->SetTextSize(legend_font_size);
     rect_legend->SetBorderSize(4);
 
+    const std::string RKN_ODD_CsI = "RKN with the ODD magnetic field and CsI";
+    const std::string RKN_ODD = "RKN with the ODD magnetic field";
+    const std::string RKN_homogeneous =
+        "RKN with the homogeneous magnetic field";
+    const std::string Helix_homogeneous =
+        "Helix with the homogeneous magnetic field";
+
     std::string rect_text = "Bound-to-bound transport";
     auto inhom_rect_material_histo = get_histogram(
         "inhom_rect_material", 25, markers[0u], log10_rk_tolerance_rect);
     // rect_legend->SetHeader("Bound-to-bound transport");
     inhom_rect_material_histo->SetMarkerColor(hues[0u]);
     inhom_rect_material_histo->Draw("hist P ");
-    rect_legend->AddEntry(inhom_rect_material_histo,
-                          "RKN with an inhomogeneous field and a material",
-                          "p");
+    rect_legend->AddEntry(inhom_rect_material_histo, RKN_ODD_CsI.c_str(), "p");
 
     auto inhom_rect_histo = get_histogram("inhom_rect", 20, markers[1u], dummy);
     inhom_rect_histo->SetMarkerColor(hues[1u]);
     inhom_rect_histo->Draw("hist P same");
-    rect_legend->AddEntry(inhom_rect_histo, "RKN with an inhomogeneous field",
-                          "p");
+    rect_legend->AddEntry(inhom_rect_histo, RKN_ODD.c_str(), "p");
 
     auto const_rect_histo = get_histogram("const_rect", 15, markers[2u], dummy);
     const_rect_histo->SetMarkerColor(hues[2u]);
     const_rect_histo->Draw("hist P same");
-    rect_legend->AddEntry(const_rect_histo, "RKN with a homogeneous field",
-                          "p");
+    rect_legend->AddEntry(const_rect_histo, RKN_homogeneous.c_str(), "p");
 
     auto helix_rect_histo = get_histogram("helix_rect", 15, markers[3u], dummy);
     helix_rect_histo->SetMarkerColor(hues[3u]);
     helix_rect_histo->Draw("hist P same");
-    rect_legend->AddEntry(helix_rect_histo, "Helix with a homogeneous field",
-                          "p");
+    rect_legend->AddEntry(helix_rect_histo, Helix_homogeneous.c_str(), "p");
 
     /*
     TLegendEntry* rect_header =
@@ -362,27 +364,22 @@ void jacobian_comparison() {
     // wire_legend->SetHeader("Perigee-to-perigee transport");
     inhom_wire_material_histo->SetMarkerColor(hues[0u]);
     inhom_wire_material_histo->Draw("hist P ");
-    wire_legend->AddEntry(inhom_wire_material_histo,
-                          "RKN with an inhomogeneous field and a material",
-                          "p");
+    wire_legend->AddEntry(inhom_wire_material_histo, RKN_ODD_CsI.c_str(), "p");
 
     auto inhom_wire_histo = get_histogram("inhom_wire", 20, markers[1u], dummy);
     inhom_wire_histo->SetMarkerColor(hues[1u]);
     inhom_wire_histo->Draw("hist P same");
-    wire_legend->AddEntry(inhom_wire_histo, "RKN with an inhomogeneous field",
-                          "p");
+    wire_legend->AddEntry(inhom_wire_histo, RKN_ODD.c_str(), "p");
 
     auto const_wire_histo = get_histogram("const_wire", 15, markers[2u], dummy);
     const_wire_histo->SetMarkerColor(hues[2u]);
     const_wire_histo->Draw("hist P same");
-    wire_legend->AddEntry(const_wire_histo, "RKN with a homogeneous field",
-                          "p");
+    wire_legend->AddEntry(const_wire_histo, RKN_homogeneous.c_str(), "p");
 
     auto helix_wire_histo = get_histogram("helix_wire", 15, markers[3u], dummy);
     helix_wire_histo->SetMarkerColor(hues[3u]);
     helix_wire_histo->Draw("hist P same");
-    wire_legend->AddEntry(helix_wire_histo, "Helix with a homogeneous field",
-                          "p");
+    wire_legend->AddEntry(helix_wire_histo, Helix_homogeneous.c_str(), "p");
 
     /*
     TLegendEntry* wire_header =

tests/validation/root/rk_tolerance_comparison.C

@@ -31,18 +31,18 @@ namespace {
 double step_title_x_offset = 1.4;
 double step_title_x = 0.175;
 double step_title_y = 0.835;
-double step_ygap = -0.05;
+double step_ygap = -0.0505;
 double x_label_offset = 0.015;
 double x_margin = 1;
 double y_label_offset = 0.015;
 double rk_title_x_offset = 0.9;
 double rk_title_offset_fraction = 0.0218;
 double rk_title_y = 14.69;
-double rk_ygap = -0.8;
+double rk_ygap = -0.83;
 double rk_header_text_size = 0.046;
-double rk_geom_text_size = 0.035;
+double rk_geom_text_size = 0.0362903;
 double step_header_text_size = 0.055;
-double step_geom_text_size = 0.0416667;
+double step_geom_text_size = 0.0434028;
 double label_font_size_step = 0.055;
 double title_font_size_step = 0.055;
 double label_font_size_rk_tol = 0.046;
@@ -407,8 +407,7 @@ void rk_tolerance_comparison(int min, int max) {
 
     const std::string rect_header = "Bound-to-bound transport";
     const std::string wire_header = "Perigee-to-perigee transport";
-    const std::string geom_header =
-        "RKN with an inhomogeneous field and a material";
+    const std::string geom_header = "RKN with the ODD magnetic field and CsI";
 
     /************************
      *  Rectangular