--- ray/src/util/glare.h	1991/03/21 17:11:48	1.10
+++ ray/src/util/glare.h	1991/04/12 10:28:39	1.14
@@ -6,19 +6,17 @@
  * Common data structures for glare source finding routines
  */
 
-#define DEBUG 1
-
 #include "standard.h"
 #include "view.h"
 #include "color.h"
 #include "setscan.h"
 
-#define GLAREBR		10.0		/* glare source is this * avg. lum. */
+#define GLAREBR		7.0		/* glare source is this * avg. lum. */
 
 #define SAMPDENS	50		/* default samples per unit in image */
 #define TSAMPSTEP	10		/* sample step to compute threshold */
 
-#define SEPS		2		/* sources this close ==> contig. */
+#define SEPS		1		/* sources this close ==> contig. */
 
 #define SAMIN		.005		/* minimum solid angle for source */
 #define MAXBUDDY	(4.*sqrt(SAMIN/PI))	/* max separation for pairing */
@@ -68,4 +66,12 @@ extern struct source {
 	struct source	*next;	/* next source in list */
 } *donelist;			/* finished sources */
 
+typedef struct {
+	double	err;		/* cumulative error */
+	double	prob;		/* target probability */
+} SPANERR;		/* probability record for computing spans */
+
 extern double	getviewpix();
+
+extern long	npixinvw;	/* number of samples in view */
+extern long	npixmiss;	/* number of samples missing */