--- ray/src/util/wrapBSDF.c	2016/10/14 00:54:22	2.21
+++ ray/src/util/wrapBSDF.c	2019/04/03 23:50:25	2.23
@@ -1,5 +1,5 @@
 #ifndef lint
-static const char RCSid[] = "$Id: wrapBSDF.c,v 2.21 2016/10/14 00:54:22 greg Exp $";
+static const char RCSid[] = "$Id: wrapBSDF.c,v 2.23 2019/04/03 23:50:25 greg Exp $";
 #endif
 /*
  * Wrap BSDF data in valid WINDOW XML file
@@ -52,6 +52,7 @@ struct s_fieldID {
 } XMLfieldID[] = {
 	{"m", 0, 1, "Manufacturer"},
 	{"n", 0, 1, "Name"},
+	{"d", 0, 0, "DeviceType"},
 	{"c", 0, 0, "ThermalConductivity"},
 	{"ef", 0, 0, "EmissivityFront"},
 	{"eb", 0, 0, "EmissivityBack"},
@@ -63,7 +64,7 @@ struct s_fieldID {
 	{"\0", 0, 0, NULL}	/* terminator */
 };
 					/* field assignments */
-#define MAXASSIGN	12
+#define MAXASSIGN	16
 const char	*field_assignment[MAXASSIGN];
 int		nfield_assign = 0;
 #define FASEP	';'
@@ -121,6 +122,23 @@ static char	basis_definition[][256] = {
 	"\t</DataDefinition>\n",
 };
 
+/* Check that the last-added data file is unique */
+static int
+check_new_data_file()
+{
+	int	i = ndataf;
+
+	while (i-- > 0)
+		if ((data_file[i].spectrum == data_file[ndataf].spectrum) &
+				(data_file[i].type == data_file[ndataf].type)) {
+			fprintf(stderr,
+				"%s: warning - ignoring duplicate component\n",
+					data_file[ndataf].fname);
+			return 0;
+		}
+	return 1;
+}
+
 /* Copy data from file descriptor to stdout and close */
 static int
 copy_and_close(int fd)
@@ -834,7 +852,7 @@ main(int argc, char *argv[])
 			}
 			data_file[ndataf].fname = argv[i];
 			data_file[ndataf].spectrum = cur_spectrum;
-			ndataf++;
+			ndataf += check_new_data_file();
 			continue;
 		case 'r':		/* reflection */
 			if (i >= argc-1)