Merge branch 'doc-preparations-3.6.0' of https://github.com/mccode-dev/McCode into doc-preparations-3.6.0

Author: willend

mcstas-comps/contrib/TOFSANSdet.comp

@@ -376,6 +376,11 @@ SAVE
   sectnIef= (double*)malloc(sizeof(double)*Nqc*20);
   sectnWtf= (double*)malloc(sizeof(double)*Nqc*20);
 
+  if (!calibNf || !calibIf || !calibIef || !calibWtf || !sectnNf || !sectnIf || !sectnIef || !sectnWtf) {
+    fprintf(stderr, "TOFSANSdet %s: Memory allocation error in SAVE. Fatal exit!\n", NAME_CURRENT_COMP);
+    exit(-1);
+  }
+
   storez /= storen;
 
   i = Nxc/2;                                     /* calculate center values on beam stop */

mcstas-comps/examples/ISIS/ISIS_LET/ISIS_LET.instr

@@ -19,29 +19,30 @@
 * %Example: Ei=3.7 res=HR Detector: sample_PSDmon_I=8835.3
 *
 * %P
-* Ei: 		[meV] 		Centre energy for moderator
-* dE: 		[] 		Multiplier for energy spread:  Emin = Ei/dE, Emax = Ei*dE
-* Ch3_speed:	[Hz]		Chopper 3 frequency
-* Ch5_speed:	[Hz]		Chopper 5 frequency
-* Ch2_phase:	[mus]		Chopper 2 phase setting
-* pha_offset:	[mus]		Offset in time for moderator focus
-* res:		[string] 	"HF" - High Flux, "HR" - High Resolution, "I" - Intermediate
-* snout:	[string]	"in" or "out"
+* Ei: 		    [meV]	Centre energy for moderator
+* dE: 		    [] 		Multiplier for energy spread:  Emin = Ei/dE, Emax = Ei*dE
+* Ch3_speed:	    [Hz]	Chopper 3 frequency
+* Ch5_speed:	    [Hz]	Chopper 5 frequency
+* Ch2_phase:	    [mus]	Chopper 2 phase setting
+* pha_offset:	    [mus]	Offset in time for moderator focus
+* res:		    [string] 	"HF" - High Flux, "HR" - High Resolution, "I" - Intermediate
+* snout:	    [string]	"in" or "out"
+* monitors_on:      [1]         Flag to enable/disable TOF monitors in primary optics
+* movable_monitors: [1]         Flag to enable/disable PSDs and Div monitors in primary optics
 *
 * %L
 * %E
 *******************************************************************************/
 
 DEFINE INSTRUMENT ISIS_LET(Ei = 3.7, dE=1.1, Ch3_speed=100, Ch5_speed=200,  Ch2_phase=95000, 
-					  pha_offset=80e-6, string res="HF", string snout = "out")
+			   pha_offset=80e-6, string res="HF", string snout = "out", int monitors_on=0, int movable_monitors=0)
 
 DECLARE
 %{
 double SE2K, v_foc, emin, emax, lam_min, lam_max, jitter=7e-7;
 double Ch1_speed, Ch2_speed=10, Ch2_offset=14500, Ch4_speed, Ch5_slit, snout_length;
 double L_Ch1=7.833, L_Ch2=8.200, L_Ch3=11.749, L_Ch4=15.664, L_Ch5=23.499;
 double L_sample=25, L2=3.5, Ch1_5_halfgap=0.005, smidge = 0.001;
-int    monitors_on=0, movable_monitors=0;
 %}
 
 INITIALIZE 

mcstas-comps/examples/Tests_polarization/Supermirror_thin_substrate/Supermirror_thin_substrate.instr

@@ -1,7 +1,7 @@
 /*******************************************************************************
 *         McStas instrument definition URL=http://www.mcstas.org
 *
-* Instrument: Supermirror_thin_substrate 
+* Instrument: Supermirror_thin_substrate
 *
 * %Identification
 * Written by: Hal Lee

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

@@ -96,10 +96,10 @@ 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,

mcstas-comps/share/plane.c

@@ -66,13 +66,15 @@ int line_plane_intersect(Coords line_p, Coords line_v, Coords plane_normal, Coor
 		(*d_intersect_point).x = 0; 
 		(*d_intersect_point).y = 0; 
 		(*d_intersect_point).z = 0; 
-		*dt = 0; 
+		*dt = 0;
+		return 0;
 	}
 	else {
 		(*d_intersect_point).x = line_v.x * (-n_dot_dp) / n_dot_v; 
 		(*d_intersect_point).y = line_v.y * (-n_dot_dp) / n_dot_v; 
 		(*d_intersect_point).z = line_v.z * (-n_dot_dp) / n_dot_v; 
-		*dt = -n_dot_dp / n_dot_v; 
+		*dt = -n_dot_dp / n_dot_v;
+		return 0;
 	}
 }
 

mcstas-comps/share/polyhedron.c

@@ -299,9 +299,9 @@ int form_polyhedron(int nf_in, Coords *fn_in, Coords *fp_in, Polyhedron *polyhed
 	Coords *fn,*fp, nn;
 	fn = calloc(nf_in, sizeof(Coords));
 	fp = calloc(nf_in, sizeof(Coords));
-
-	//loop through nf_in
-	for (i = 0; i < nf_in; i++) {
+	if(fn && fp) {
+	  //loop through nf_in
+	  for (i = 0; i < nf_in; i++) {
 		//fn_in[i] must have non-zero length
 		if (coords_len(fn_in[i]) < DBL_EPSILON) {
 			//error, skip this one
@@ -335,22 +335,23 @@ int form_polyhedron(int nf_in, Coords *fn_in, Coords *fp_in, Polyhedron *polyhed
 				++nf;
 			}
 		}
-	}
+	  }
 
-	if (nf < 4) {
+	  if (nf < 4) {
 		return 0;
-	}
+	  }
 
-	a->nf = nf;
-	a->fn = calloc(nf, sizeof(Coords));
-	a->fp = calloc(nf, sizeof(Coords));
-	for (i = 0; i < nf; i++) {
+	  a->nf = nf;
+	  a->fn = calloc(nf, sizeof(Coords));
+	  a->fp = calloc(nf, sizeof(Coords));
+	  for (i = 0; i < nf; i++) {
 		a->fn[i] = fn[i];
 		a->fp[i] = fp[i];
-	}
+	  }
 
-	free(fn);
-	free(fp);
+	  free(fn);
+	  free(fp);
+	}
 	//note: do not zero nf, useful below.
 
 	////////////////////////
@@ -366,6 +367,12 @@ int form_polyhedron(int nf_in, Coords *fn_in, Coords *fp_in, Polyhedron *polyhed
 	vp = calloc(nv, sizeof(Coords));
 	nfvi = calloc(nf, sizeof(int));
 	ifvi = calloc(nf, sizeof(int*));
+
+	if(!vp || !nfvi || !ifvi) {
+	  fprintf(stderr, "polyhedron.c / form_polyhedron - calloc error. Exit!\n");
+	  exit(-1);
+	}
+	
 	for (i = 0; i < nf; i++) {
 		ifvi[i] = calloc(nv, sizeof(int));
 	}
@@ -443,7 +450,8 @@ int form_polyhedron(int nf_in, Coords *fn_in, Coords *fp_in, Polyhedron *polyhed
 					if (m >= 3 && keep) {
 						//Now start checking
 						eliminate_list = (int *)calloc(m, sizeof(int)); //initialise with 0 = not eliminate assocated vertex reference
-						for (l = 0; l < m-2; l++) { //loop through vertices other than the last two since each check involves 3 different vertices
+						if(eliminate_list) {
+						  for (l = 0; l < m-2; l++) { //loop through vertices other than the last two since each check involves 3 different vertices
 							if (eliminate_list[m-1]) {
 								//association with new vertext eliminated. Skip to check next plane.
 								keep = 0;
@@ -478,9 +486,9 @@ int form_polyhedron(int nf_in, Coords *fn_in, Coords *fp_in, Polyhedron *polyhed
 									eliminate_list[n] = 1;
 								}
 							}
-						}
-						//update list of vertex numbers associated with planes 
-						if (keep) {
+						  }
+						  //update list of vertex numbers associated with planes 
+						  if (keep) {
 							for (l = 0, n = 0; l < m; l++) {
 								if (eliminate_list[l]) {
 									continue;
@@ -489,8 +497,9 @@ int form_polyhedron(int nf_in, Coords *fn_in, Coords *fp_in, Polyhedron *polyhed
 								++n;
 							}
 							nfvi[ii] = n;
+						  }
+						  free(eliminate_list);
 						}
-						free(eliminate_list);
 					}
 				}
 			}
@@ -536,39 +545,40 @@ int form_polyhedron(int nf_in, Coords *fn_in, Coords *fp_in, Polyhedron *polyhed
 			//The order of the vertices will go along the edge of the polyhedron face
 			PolyhedronIndexValuePair *iA; 
 			iA = calloc(nfvi[i], sizeof(PolyhedronIndexValuePair));
-			
-			k = ifvi[i][0];
-			iA[0].index = k;
-			iA[0].value = -2; //ensure the starting point stays the first point. 
-			p0 = a->vp[k];
-			k = ifvi[i][1];
-			dp01 = coords_sub(a->vp[k], p0); //reference line is between the first & second point
-			l1 = coords_len(dp01);
-			iA[1].index = k;
-			iA[1].value = 1; //angle between the line from first to second point and the reference line is 0, i.e. cosA = 1  
-			
-			for (j = 2; j < nfvi[i]; j++) {
-				k = ifvi[i][j];
-				iA[j].index = k;
-				
-				dp0n = coords_sub(a->vp[k], p0);
-				l2 = coords_len(dp0n);
+			if (iA) {
+			  k = ifvi[i][0];
+			  iA[0].index = k;
+			  iA[0].value = -2; //ensure the starting point stays the first point. 
+			  p0 = a->vp[k];
+			  k = ifvi[i][1];
+			  dp01 = coords_sub(a->vp[k], p0); //reference line is between the first & second point
+			  l1 = coords_len(dp01);
+			  iA[1].index = k;
+			  iA[1].value = 1; //angle between the line from first to second point and the reference line is 0, i.e. cosA = 1  
+			  
+			  for (j = 2; j < nfvi[i]; j++) {
+			    k = ifvi[i][j];
+			    iA[j].index = k;
+			    
+			    dp0n = coords_sub(a->vp[k], p0);
+			    l2 = coords_len(dp0n);
 				iA[j].value = coords_sp(dp01, dp0n)/l1/l2;
+			  }
+			  
+			  //sort the sequence according to iA[j].value, 
+			  //the order of iA[j] is rearranged as a result
+			  //the resulting ordered index are in iA[j].index
+			  qsort(iA, nfvi[i], sizeof(iA[0]), polyhedron_qsort_compare_func);
+			  
+			  //store the face vertext indices in the correct order in the array of face vertex indices
+			  a->afvi[i].ifvi = calloc(nfvi[i],sizeof(int));
+			  
+			  for (j = 0; j < nfvi[i]; j++) {
+			    a->afvi[i].ifvi[j] = iA[j].index;
+			  }
+			  
+			  free(iA);
 			}
-	
-			//sort the sequence according to iA[j].value, 
-			//the order of iA[j] is rearranged as a result
-			//the resulting ordered index are in iA[j].index
-			qsort(iA, nfvi[i], sizeof(iA[0]), polyhedron_qsort_compare_func);
-			
-			//store the face vertext indices in the correct order in the array of face vertex indices
-			a->afvi[i].ifvi = calloc(nfvi[i],sizeof(int));
-			
-			for (j = 0; j < nfvi[i]; j++) {
-				a->afvi[i].ifvi[j] = iA[j].index;
-			}
-			
-			free(iA);
 		}
 	}
 

mcstas-comps/share/supermirror-lib.c

@@ -268,8 +268,10 @@ int to_lower_case(char *in, char **out)
 			int i; 
 			if (out) {
 				*out=(char*)calloc(n+1,sizeof(char));
-				for(i=0; i<n; i++) (*out)[i]= in[i]>='A'&&in[i]<='Z' ? in[i]|0x60 : in[i]; //convert to lower case
-				if (i < CHAR_BUF_LENGTH) (*out)[i] = 0; //zero terminate the out string. 
+				if (*out) {
+				  for(i=0; i<n; i++) (*out)[i]= in[i]>='A'&&in[i]<='Z' ? in[i]|0x60 : in[i]; //convert to lower case
+				  if (i < CHAR_BUF_LENGTH) (*out)[i] = 0; //zero terminate the out string.
+				}
 			}
 			else {
 				for(i=0; i<n; i++) in[i]= in[i]>='A'&&in[i]<='Z' ? in[i]|0x60 : in[i]; //convert to lower case
@@ -451,7 +453,8 @@ void sm_print_state(char*subheader, SimState*state, Supermirror*sm, double ws_ta
 
 	int supermirror_flat_i_prefix = 0; 
 	char supermirror_flat_s_prefix[CHAR_BUF_LENGTH]; 
-
+	sprintf(supermirror_flat_s_prefix,"Sub_%s",subheader);
+		
 	int i;
 
 	printf("%s sm_print_state: %s\n", supermirror_flat_s_prefix, subheader);
@@ -617,9 +620,9 @@ void sm_print_state(char*subheader, SimState*state, Supermirror*sm, double ws_ta
 			printf("%s T_ir_at_ir_order_0[+/-] = indetermined\n", supermirror_flat_s_prefix);
 		}
 		else {
-			printf("%s T_ir_all[+/-] = (% 5f,% 5f %)\n", supermirror_flat_s_prefix,
+			printf("%s T_ir_all[+/-] = (% 5f,% 5f)\n", supermirror_flat_s_prefix,
 				state->T_ir_all[0], state->T_ir_all[1]);
-			printf("%s T_ir_at_ir_order_0[+/-] = (% 5f,% 5f %)\n", supermirror_flat_s_prefix,
+			printf("%s T_ir_at_ir_order_0[+/-] = (% 5f,% 5f)\n", supermirror_flat_s_prefix,
 				state->T_ir_at_ir_order_0[1], state->T_ir_at_ir_order_0[1]);
 		}
 	supermirror_flat_dec_prefix(&supermirror_flat_i_prefix, supermirror_flat_s_prefix);
@@ -808,8 +811,8 @@ int set_supermirror_flat_geometry (
 		MPI_MASTER(printf(	"set_supermirror_flat_geometry: ERROR tilt_y_axis_location=\"%s\" must be one of the following\n"
 					"                               \"TopFrontEdge\",\"TopMirrorCentre\",\"TopBackEdge\"\n"
 					"                               \"FrontSubstrateCentre\",\"SubstrateCentre\",\"BackSubstrateCentre\"\n" 
-					"                               \"BottomFrontEdge\",\"BottomMirrorCentre\",\"BottomBackEdge\" (case-insensitive)\n"
-					);)
+					"                               \"BottomFrontEdge\",\"BottomMirrorCentre\",\"BottomBackEdge\" (case-insensitive)\n",
+					lc);)
 		if (lc != 0) {
 			free(lc);
 			lc = 0;
@@ -3374,7 +3377,9 @@ int InitialiseStdSupermirrorFlat(
 	}
 	if (lc == 0) {
 		lc = (char*)calloc(14, sizeof(char));
-		strcpy(lc,"bothnotcoated");
+		if (lc) {
+		  strcpy(lc,"bothnotcoated");
+		}
 	}
 	if (strcmp(lc,"bothcoated") == 0) {
 		strcpy(top_mirror_spin_plus_material, mirror_spin_plus_material_name); top_mirror_spin_plus_m = mirror_spin_plus_m;