Merge branch 'off_file_mesh_component' into main

Author: willend

mcstas-comps/examples/Tests_union/Geometry_test/Geometry_test.instr

@@ -16,16 +16,16 @@
 * Test of all Union geometry components in one file
 *
 * %Description
-* Use of all basic geometries, sphere, cylinder, cone and box
+* Use of all basic geometries, mesh(as a torus), sphere, cylinder, cone and box
 *
-* %Example: dummy=1 Detector: detector_scat_I=40.2053
+* %Example: meshfile="torus.off" Detector: detector_scat_I=40.2053
 *
 * %Parameters
 *
 * %End
 *******************************************************************************/
 
-DEFINE INSTRUMENT Geometry_test(dummy=1)
+DEFINE INSTRUMENT Geometry_test(string meshfile="torus.off")
 
 DECLARE
 %{
@@ -96,10 +96,20 @@ COMPONENT sample_box = Union_box(
 AT (-0.01,0,0) RELATIVE sample_pos
 ROTATED (34,17,0) RELATIVE sample_pos
 
-COMPONENT sample_cone = Union_cone(
- radius_top=0.031, radius_bottom=0.005, yheight=0.04, priority=22, material_string="Cu")
-AT (0.02,-0.03,0) RELATIVE sample_pos
-ROTATED (0,0,20) RELATIVE sample_pos
+/* COMPONENT sample_cone = Union_cone( */
+/*  radius_top=0.031, radius_bottom=0.005, yheight=0.04, priority=22, material_string="Cu") */
+/* AT (0.02,-0.03,0) RELATIVE sample_pos */
+/* ROTATED (0,0,20) RELATIVE sample_pos */
+
+COMPONENT sample_torus  = Union_mesh(
+   filename = meshfile,
+   material_string="Al",
+   coordinate_scale =0.025,
+   priority=346,
+   skip_convex_check=1
+) AT (0,0,0.02) RELATIVE sample_pos
+ROTATED (0,45,0) RELATIVE sample_pos
+
 
 COMPONENT test_logger_1D = Union_logger_1D(
   variable="time", min_value=1E-4, max_value=8E-4, n1=200, filename="logger_1D.dat"

mcstas-comps/examples/Tests_union/Geometry_test/torus.STL

@@ -429,7 +429,7 @@ int Powder_physics_my(double *my,double *k_initial, union data_transfer_union da
 
     int method_switch = 1;
     // For test
-    int line_v,line0,line,count;
+    int line_v,line0,line;
 
     // Should not interfer with the global variables
     double vx = k_initial[0]*K2V;
@@ -475,7 +475,7 @@ int Powder_physics_my(double *my,double *k_initial, union data_transfer_union da
           /* not yet set: we compute the sum up to the corresponding speed in the table cache */
           //printf("Nq and sum not yet set, have to do this calculation now\n");
           double line_v = line_info->v_min + line*(line_info->v_max - line_info->v_min)/CHAR_BUF_LENGTH;
-          for(line0=0; line0<count; line0++) {
+          for(line0=0; line0<line_info->count; line0++) {
             if (line_info->q_v[line0] <= 2*line_v) { /* q < 2*kf: restrict structural range */
               line_info->my_s_v2_sum += line_info->my_s_v2[line0];
               if (line_info->Nq < line0+1) line_info->Nq=line0+1; /* determine maximum line index which can scatter */
@@ -491,7 +491,7 @@ int Powder_physics_my(double *my,double *k_initial, union data_transfer_union da
 
         line_info->xs_calls++;
 
-        for(line=line0; line<count; line++) {
+        for(line=line0; line<line_info->count; line++) {
           if (line_info->q_v[line] <= 2*v) { /* q < 2*kf: restrict structural range */
             line_info->my_s_v2_sum += line_info->my_s_v2[line];
             if (line_info->Nq < line+1) line_info->Nq=line+1; /* determine maximum line index which can scatter */

mcstas-comps/examples/Tests_union/Geometry_test/torus.off

@@ -235,6 +235,8 @@ struct surface_stack_struct cut_surface_stack;
 
 INITIALIZE
 %{
+// Initialize this Volume
+geometry_struct_init(&(this_box_volume.geometry));
 // Initializes the focusing system for this volume including input sanitation.
 focus_initialize(&this_box_volume.geometry, POS_A_COMP_INDEX(INDEX_CURRENT_COMP+target_index), POS_A_CURRENT_COMP, ROT_A_CURRENT_COMP, target_index, target_x, target_y, target_z, focus_aw, focus_ah, focus_xw, focus_xh, focus_r, NAME_CURRENT_COMP);
 

mcstas-comps/share/union-lib.c

@@ -221,6 +221,7 @@ struct surface_stack_struct cut_surface_stack;
 
 INITIALIZE
 %{
+geometry_struct_init(&(this_cone_volume.geometry));
 // Initializes the focusing system for this volume including input sanitation.
 focus_initialize(&this_cone_volume.geometry, POS_A_COMP_INDEX(INDEX_CURRENT_COMP+target_index), POS_A_CURRENT_COMP, ROT_A_CURRENT_COMP, target_index, target_x, target_y, target_z, focus_aw, focus_ah, focus_xw, focus_xh, focus_r, NAME_CURRENT_COMP);
 

mcstas-comps/union/Powder_process.comp

@@ -190,6 +190,7 @@ struct surface_stack_struct cut_surface_stack;
 
 INITIALIZE
 %{
+geometry_struct_init(&(this_cylinder_volume.geometry));
 // Initializes the focusing system for this volume including input sanitation.
 focus_initialize(&this_cylinder_volume.geometry, POS_A_COMP_INDEX(INDEX_CURRENT_COMP+target_index), POS_A_CURRENT_COMP, ROT_A_CURRENT_COMP, target_index, target_x, target_y, target_z, focus_aw, focus_ah, focus_xw, focus_xh, focus_r, NAME_CURRENT_COMP);
 

mcstas-comps/union/Union_box.comp

@@ -147,6 +147,7 @@ void record_to_temp_2DS(Coords *position, double *k_new, double *k_old, double p
   if (add_point == 1) {
 
     double p1,p2;
+    p1=p2=0;
 
     // dim_1_choice = 0 for x, 1 for y, 2 for z. Done in initialize from input. "x" "y" "z".
     if (storage->dim_1_choice == 0)
@@ -262,6 +263,7 @@ void record_to_perm_2DS(Coords *position, double *k_new, double *k_old, double p
   if (add_point == 1) {
     //printf("storage was set \n");
     double p1,p2;
+    p1=p2=0;
 
     // dim_1_choice = 0 for x, 1 for y, 2 for z. Done in initialize from input "x" "y" "z".
     if (storage->dim_1_choice == 0)

mcstas-comps/union/Union_cone.comp

@@ -149,6 +149,7 @@ void record_to_temp_2DS_t(Coords *position, double *k_new, double *k_old, double
   if (add_point == 1) {
 
     double p1,p2;
+    p1=p2=0;
 
     // dim_1_choice = 0 for x, 1 for y, 2 for z. Done in initialize from input. "x" "y" "z".
     if (storage->dim_1_choice == 0)
@@ -270,6 +271,7 @@ void record_to_perm_2DS_t(Coords *position, double *k_new, double *k_old, double
   if (add_point == 1) {
     //printf("storage was set \n");
     double p1,p2;
+    p1=p2=0;
 
     // dim_1_choice = 0 for x, 1 for y, 2 for z. Done in initialize from input. "x" "y" "z".
     if (storage->dim_1_choice == 0)