Fixed error that occured when using multiple Union_master compoments,

as the focus data need to be copied to each copy of the original volume.

Author: mads-bertelsen

mcstas-comps/share/union-lib.c

@@ -405,10 +405,8 @@ int mask_mode; // ALL/ANY 1/2. In ALL mode, only parts covered by all masks is s
 double geometry_p_interact; // fraction of rays that interact with this volume for each scattering (between 0 and 1, 0 for disable)
 union geometry_parameter_union geometry_parameters; // relevant parameters for this shape
 union geometry_parameter_union (*copy_geometry_parameters)(union geometry_parameter_union*);
-struct focus_data_struct focus_data; // Used for focusing from this geometry
 
-// New focus data implementation to remove the focusing bug for non-isotripic processes
-struct focus_data_array_struct focus_data_array;
+struct focus_data_array_struct focus_data_array; // Focusing specified by user is element 0 and used for isotropic processes, rotated versions are added by master
 struct pointer_to_1d_int_list focus_array_indices; // Add 1D integer array with indecies for correct focus_data for each process
 
 
@@ -837,6 +835,24 @@ void add_element_to_focus_data_array(struct focus_data_array_struct *focus_data_
       focus_data_array->elements[focus_data_array->num_elements-1] = focus_data;
     }
     };
+	
+void copy_focus_data_array(struct focus_data_array_struct *original_array, struct focus_data_array_struct *new_array) {
+	
+	new_array->num_elements = original_array->num_elements;
+	new_array->elements = malloc(new_array->num_elements*sizeof(struct focus_data_struct));
+
+	if (new_array->elements == NULL) {
+		fprintf(stderr, "Memory allocation failed in copy_focus_data_struct \n");
+		exit(1);
+	}
+		
+	int iterate;
+	for (iterate=0;iterate<original_array->num_elements;iterate++) {
+		new_array->elements[iterate] = original_array->elements[iterate];
+	}
+
+	};
+
 
 
 void add_to_logger_with_data(struct logger_with_data_struct *logger_with_data, struct logger_struct *logger) {

mcstas-comps/union/Union_master.comp

@@ -604,7 +604,11 @@ exit(-1);
         // The geometry storage needs a shallow copy as well (hard copy not necessary for any current geometries), may need changes in future
         // A simple copy_geometry_parameters function is added to the geometry in each geometry component
         Volumes[volume_index]->geometry.geometry_parameters = Volumes[volume_index]->geometry.copy_geometry_parameters(&global_geometry_list_master->elements[geometry_list_index].Volume->geometry.geometry_parameters);
-          
+		
+		// Copy focusing data too, it will be modified based on this master components rotation, so should not be reused		
+		copy_focus_data_array(&global_geometry_list_master->elements[geometry_list_index].Volume->geometry.focus_data_array, 
+							  &Volumes[volume_index]->geometry.focus_data_array);
+
       }
 
       // This section identifies the different non isotropic processes in the current volume and give them appropriate transformation matrices