--- ray/src/px/pcond.h	1996/10/04 18:34:56	3.2
+++ ray/src/px/pcond.h	1997/01/29 13:22:11	3.5
@@ -1,4 +1,4 @@
-/* Copyright (c) 1996 Regents of the University of California */
+/* Copyright (c) 1997 Regents of the University of California */
 
 /* SCCSid "$SunId$ LBL" */
 
@@ -18,6 +18,9 @@
 #define SWNORM		2.26		/* scotopic/photopic ratio for white */
 #define WHTSEFFICACY	(SWNORM*WHTEFFICACY)
 
+#define BotMesopic	5.62e-3		/* top of scotopic range */
+#define TopMesopic	5.62		/* bottom of photopic range */
+
 #define FOVDIA		(1.0*PI/180.)	/* foveal diameter (radians) */
 
 #define	HISTRES		100		/* histogram resolution */
@@ -36,7 +39,8 @@
 #define DO_HSENS	04
 #define DO_COLOR	010
 #define DO_CWEIGHT	020
-#define DO_LINEAR	040
+#define DO_FIXHIST	040
+#define DO_LINEAR	0100
 
 #define DO_HUMAN	(DO_ACUITY|DO_VEIL|DO_HSENS|DO_COLOR)
 
@@ -62,12 +66,16 @@ extern short	fvxr, fvyr;		/* foveal image resolution *
 
 #define fovscan(y)	(fovimg+(y)*fvxr)
 
-extern int	bwhist[HISTRES];	/* luminance histogram */
-extern long	histot;			/* total count of histogram */
+extern double	fixfrac;		/* histogram share due to fixations */
+extern short	(*fixlst)[2];		/* fixation history list */
+extern int	nfixations;		/* number of fixation points */
+
+extern float	bwhist[HISTRES];	/* luminance histogram */
+extern double	histot;			/* total count of histogram */
 extern double	bwmin, bwmax;		/* histogram limits */
 extern double	bwavg;			/* mean brightness */
 
-#define bwhc(B)		bwhist[(int)(HISTRES*((B)-bwmin)/(bwmax-bwmin))]
+#define bwhi(B)		(int)(HISTRES*((B)-bwmin)/(bwmax-bwmin))
 
 extern RGBPRIMP	inprims;		/* input primaries */
 extern COLORMAT	inrgb2xyz;		/* convert input RGB to XYZ */