--- ray/src/rt/rxtmain.cpp	2024/05/01 22:06:09	2.4
+++ ray/src/rt/rxtmain.cpp	2025/03/05 18:56:28	2.12
@@ -1,8 +1,8 @@
 #ifndef lint
-static const char	RCSid[] = "$Id: rxtmain.cpp,v 2.4 2024/05/01 22:06:09 greg Exp $";
+static const char	RCSid[] = "$Id: rxtmain.cpp,v 2.12 2025/03/05 18:56:28 greg Exp $";
 #endif
 /*
- *  rxtmain.c - main for per-ray calculation program
+ *  rxtmain.cpp - main for per-ray calculation program
  */
 
 #include "copyright.h"
@@ -43,7 +43,7 @@ extern void  tranotify(OBJECT obj);
 char  *tralist[MAXMODLIST];		/* list of modifers to trace (or no) */
 int  traincl = -1;			/* include == 1, exclude == 0 */
 
-double  (*sens_curve)(SCOLOR scol) = NULL;	/* spectral conversion for 1-channel */
+double  (*sens_curve)(const SCOLOR scol) = NULL;	/* spectral conversion for 1-channel */
 double  out_scalefactor = 1;		/* output calibration scale factor */
 RGBPRIMP  out_prims = stdprims;		/* output color primitives (NULL if spectral) */
 static RGBPRIMS  our_prims;		/* private output color primitives */
@@ -52,7 +52,7 @@ static void onsig(int  signo);
 static void sigdie(int  signo, const char  *msg);
 static void printdefaults(void);
 
-#define RXTRACE_FEATURES	"IrradianceCalc\nIrradianceCalc\nDistanceLimiting\n" \
+#define RXTRACE_FEATURES	"IrradianceCalc\nMultiprocessing\nDistanceLimiting\n" \
 				"HessianAmbientCache\nAmbientAveraging\n" \
 				"AmbientValueSharing\nAdaptiveShadowTesting\n" \
 				"Outputs=o,d,v,V,w,W,l,L,c,p,n,N,s,m,M,r,x,R,X,~\n" \
@@ -142,7 +142,7 @@ main(int  argc, char  *argv[])
 			break;
 		case 'I':				/* immed. irradiance */
 			rval = myRTmanager.rtFlags & RTimmIrrad;
-			check_bool(3,rval);
+			check_bool(2,rval);
 			if (rval) myRTmanager.rtFlags |= RTimmIrrad;
 			else myRTmanager.rtFlags &= ~RTimmIrrad;
 			break;
@@ -303,7 +303,9 @@ main(int  argc, char  *argv[])
 	rval = setspectrsamp(CNDX, WLPART);
 	if (rval < 0)
 		error(USER, "unsupported spectral sampling");
-	if (out_prims != NULL) {
+	if (sens_curve != NULL)
+		out_prims = NULL;
+	else if (out_prims != NULL) {
 		if (!rval)
 			error(WARNING, "spectral range incompatible with color output");
 	} else if (NCSAMP == 3)
@@ -351,16 +353,17 @@ main(int  argc, char  *argv[])
 	if (outform != 'a')
 		SET_FILE_BINARY(stdout);
 	if (doheader) {			/* print header? */
-		static char	fmt[] = OCTFMT;
-		FILE *		octfp = fopen(argv[i], "rb");
-		if (checkheader(octfp, fmt, stdout) < 0)
-			error(USER, "bad octree header");
-		fclose(octfp);
+		newheader("RADIANCE", stdout);
+		fputs(myRTmanager.GetHeadStr(), stdout);
 		printargs(i, argv, stdout);
 		printf("SOFTWARE= %s\n", VersionID);
 		fputnow(stdout);
 		if (rval > 0)		/* saved from setrtoutput() call */
-			printf("NCOMP=%d\n", rval);
+			fputncomp(rval, stdout);
+		if (NCSAMP > 3)
+			fputwlsplit(WLPART, stdout);
+		if ((out_prims != stdprims) & (out_prims != NULL))
+			fputprims(out_prims, stdout);
 		if ((outform == 'f') | (outform == 'd'))
 			fputendian(stdout);
 		fputformat(formstr(outform), stdout);
@@ -390,7 +393,7 @@ wputs(				/* warning output function */
 
 void
 eputs(				/* put string to stderr */
-	char  *s
+	const char  *s
 )
 {
 	static int  midline = 0;