--- ray/src/px/pcond.h	1996/10/03 16:52:49	3.1
+++ ray/src/px/pcond.h	1997/03/19 13:03:11	3.7
@@ -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 */
@@ -31,20 +34,21 @@
 #define Lb1(Bw)		exp(Bw)		/* first derivative of Lb(Bw) */
 
 				/* Flags of what to do */
-#define	DO_ACUITY	01
+#define DO_ACUITY	01
 #define DO_VEIL		02
 #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)
 
 extern int	what2do;		/* desired adjustments */
 
 extern double	ldmax;			/* maximum output luminance */
-extern double	ldmin;			/* minimum output luminance */
-extern double	Bldmin, Bldmax;		/* Bl(ldmin) and Bl(ldmax) */
+extern double	lddyn;			/* display dynamic range */
+extern double	Bldmin, Bldmax;		/* Bl(ldmax/lddyn) and Bl(ldmax) */
 
 extern char	*progname;		/* global argv[0] */
 
@@ -57,18 +61,23 @@ extern double	inpexp;			/* input exposure value */
 #define	plum(clr)	((*lumf)(clr,0)/inpexp)
 #define slum(clr)	((*lumf)(clr,1)/inpexp)
 
+#define ldmin		(ldmax/lddyn)
+
 extern COLOR	*fovimg;		/* foveal (1 degree) averaged image */
 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 lwhc(L)		bwhc(Bl(L))
-#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 */
@@ -82,11 +91,7 @@ extern double	pixaspect;		/* pixel aspect ratio */
 extern RESOLU	inpres;			/* input picture resolution */
 
 extern char	*mbcalfile;		/* macbethcal mapping file */
-
-struct mbc {		/* data structure for macbethcal conditioning */
-	float	xa[3][6], ya[3][6];
-	COLORMAT	cmat;
-};
+extern char	*cwarpfile;		/* color warp mapping file */
 
 extern double	hacuity();		/* human acuity func. (cycles/deg.) */
 extern double	htcontrs();		/* human contrast sens. func. */