--- ray/src/util/rsensor.c	2015/04/24 19:17:12	2.17
+++ ray/src/util/rsensor.c	2022/03/15 18:05:03	2.21
@@ -1,5 +1,5 @@
 #ifndef lint
-static const char RCSid[] = "$Id: rsensor.c,v 2.17 2015/04/24 19:17:12 greg Exp $";
+static const char RCSid[] = "$Id: rsensor.c,v 2.21 2022/03/15 18:05:03 greg Exp $";
 #endif
 
 /*
@@ -9,6 +9,7 @@ static const char RCSid[] = "$Id: rsensor.c,v 2.17 201
  */
 
 #include "ray.h"
+#include "platform.h"
 #include "source.h"
 #include "view.h"
 #include "random.h"
@@ -26,8 +27,7 @@ VIEW		ourview =  {VT_ANG,{0.,0.,0.},{0.,0.,1.},{1.,0.,
                                 1.,180.,180.,0.,0.,0.,0.,
                                 {0.,0.,0.},{0.,0.,0.},0.,0.};
 
-unsigned long	nsamps = 10000;	/* desired number of initial samples */
-unsigned long	nssamps = 9000;	/* number of super-samples */
+long		nsamps = 10000;	/* desired number of initial samples */
 int		ndsamps = 32;	/* number of direct samples */
 int		nprocs = 1;     /* number of rendering processes */
 
@@ -59,7 +59,6 @@ print_defaults()		/* print out default parameters */
 	over_options();
 	printf("-n %-9d\t\t\t# number of processes\n", nprocs);
 	printf("-rd %-9ld\t\t\t# ray directions\n", nsamps);
-	/* printf("-rs %-9ld\t\t\t# ray super-samples\n", nssamps); */
 	printf("-dn %-9d\t\t\t# direct number of samples\n", ndsamps);
 	printf("-vp %f %f %f\t# view point\n",
 			ourview.vp[0], ourview.vp[1], ourview.vp[2]);
@@ -77,7 +76,9 @@ quit(ec)			/* make sure exit is called */
 int	ec;
 {
 	if (ray_pnprocs > 0)	/* close children if any */
-		ray_pclose(0);		
+		ray_pclose(0);
+	else if (ray_pnprocs < 0)
+		_exit(ec);	/* avoid flush in child */
 	exit(ec);
 }
 
@@ -129,8 +130,6 @@ main(
 		if (argv[i][1] == 'r') {	/* sampling options */
 			if (argv[i][2] == 'd')
 				nsamps = atol(argv[++i]);
-			else if (argv[i][2] == 's')
-				nssamps = atol(argv[++i]);
 			else {
 				sprintf(errmsg, "bad option at '%s'", argv[i]);
 				error(USER, errmsg);
@@ -237,7 +236,7 @@ load_sensor(
 		cp = fskip(cp);
 		if (cp == NULL)
 			break;
-		if (ntp[1] > 1 && sarr[ntp[1]+1] <= sarr[ntp[1]]) {
+		if (ntp[1] > 1 && sarr[ntp[1]+1] <= sarr[ntp[1]]+FTINY) {
 			sprintf(errmsg,
 		"Phi values not monotinically increasing in sensor file '%s'",
 					sfile);
@@ -303,10 +302,14 @@ load_sensor(
 	else if (fabs(sarr[1]) > FTINY)
 		sprintf(errmsg, "minimum phi must be 0 in sensor file '%s'",
 				sfile);
-	else if (sarr[ntp[1]] <= FTINY)
+	else if (sarr[ntp[1]] < 270.-FTINY)
 		sprintf(errmsg,
-			"maximum phi must be positive in sensor file '%s'",
+			"maximum phi must be 270 or greater in sensor file '%s'",
 				sfile);
+	else if (sarr[ntp[1]] >= 360.-FTINY)
+		sprintf(errmsg,
+			"maximum phi must be less than 360 in sensor file '%s'",
+				sfile);
 	if (errmsg[0])
 		error(USER, errmsg);
 	return((float *)realloc((void *)sarr, sizeof(float)*nelem));
@@ -318,7 +321,7 @@ init_ptable(
 	char	*sfile
 )
 {
-	int	samptot = nsamps;
+	long	samptot = nsamps;
 	float	*rowp, *rowp1;
 	double	rowsum[MAXNT], rowomega[MAXNT];
 	double	thdiv[MAXNT+1], phdiv[MAXNP+1];