--- ray/src/cv/ies2rad.c	1993/03/18 11:21:21	2.6
+++ ray/src/cv/ies2rad.c	1993/08/23 10:22:42	2.9
@@ -11,6 +11,7 @@ static char SCCSid[] = "$SunId$ LBL";
  */
 
 #include <stdio.h>
+#include <math.h>
 #include <ctype.h>
 #include "color.h"
 #include "paths.h"
@@ -406,8 +407,11 @@ char	*inpname, *outname;
 	}
 	if (lampcolor == NULL) {
 		fprintf(stderr, "%s: warning - no lamp type\n", inpname);
+		fputs("# Unknown lamp type (used default)\n", outfp);
 		lampcolor = defcolor;
-	}
+	} else if (lamptype == NULL)
+		fprintf(outfp,"# CIE(x,y) = (%f,%f)\n# Depreciation = %.1f%%\n",
+				lampcolor[3], lampcolor[4], 100.*lampcolor[5]);
 	if (feof(inpfp)) {
 		fprintf(stderr, "%s: not in IES format\n", inpname);
 		goto readerr;
@@ -563,9 +567,9 @@ char	*mod, *name;
 	else if (pmtype == PM_B)
 		fprintf(out, "5 ");
 	else if (FEQ(bounds[1][0],90.) && FEQ(bounds[1][1],270.))
-		fprintf(out, "8 ");
+		fprintf(out, "7 ");
 	else
-		fprintf(out, "6 ");
+		fprintf(out, "5 ");
 	fprintf(out, "%s %s source.cal ",
 			srcshape.type==SPHERE ? "corr" : "flatcorr",
 			libname(buf,name,T_DST));
@@ -584,7 +588,7 @@ char	*mod, *name;
 				fprintf(out, "src_phi2 ");
 			else
 				fprintf(out, "src_phi ");
-			fprintf(out, "src_theta -my ");
+			fprintf(out, "src_theta ");
 			if (FEQ(bounds[1][0],90.) && FEQ(bounds[1][1],270.))
 				fprintf(out, "-rz -90 ");
 		} else