ViewVC Help

View File | Revision Log | Show Annotations | Download File | Root Listing

root/Development/ray/src/util/evalglare.c

Comparing ray/src/util/evalglare.c (file contents):
Revision 2.11 by greg, Tue Jun 30 15:57:30 2020 UTC vs.
Revision 3.06 by greg, Mon Sep 15 20:21:24 2025 UTC

#	Line 1 | Line 1
1		#ifndef lint
2	<	static const char RCSid[] = "$Id$";
2	>	static const char RCSid[] = "$Id$";
3		#endif
4	<	/* EVALGLARE V2.10
5	<	* Evalglare Software License, Version 2.0
4	>	/* EVALGLARE V3.05
5	>	* Evalglare Software License, Version 3.0x
6		*
7	<	* Copyright (c) 1995 - 2020 Fraunhofer ISE, EPFL.
7	>	* Copyright (c) 1995 - 2022 Fraunhofer ISE, EPFL.
8		* All rights reserved.
9		*
10		*
#	Line 356 | Line 356 | calculate "illuminance-contribution of zones"
356		2020/06/22 - added Ev contribution from each glare source as output to the multiimage mode
357		-switch for correction modes (-C), value of 0 switches off all corrections
358		*/
359	<
359	>
360	>
361	>	/* evalglare.c, v2.11  2020/07/06
362	>	-add extra output for DGP-contribution in -d mode
363	>	-fix (remove) 1 pixel offset of the mulltiimage-mode
364	>	*/
365	>
366	>	/* evalglare.c, v2.12  2021/07/19
367	>	-bugfix: center of glare source calculation now based on l*omega weighting, before it was just on omega.
368	>	*/
369	>
370	>	/* evalglare.c, v2.13  2021/07/21
371	>	- center of glare source calculation now based on l*l*omega weighting.
372	>	- bugfix: Position-index below line of sight is now corrected and based on the modified equation from Iwata and Osterhaus 2010
373	>	*/
374	>
375	>	/* evalglare.c, v2.14  2021/10/20
376	>	- center of glare source calculation now based on l*omega weighting.
377	>	- adding UGP2 equation to the output
378	>	- new default setting: low-light correction off !
379	>	*/
380	>
381	>	/* evalglare.c, v3.0  2021/12/24
382	>	- adding patch-mode (-z patchangle combineflag ) as glare source grouping method
383	>	*/
384	>
385	>	/* evalglare.c, v3.01  2022/01/05
386	>	- change of multi-image-mode. Adding extra scans with scaled image
387	>	syntax now: -Q n_images n_extrascans_per_image n_images*( imagename x y  n_extrascans*(scale) )
388	>	*/
389	>	/* evalglare.c, v3.02  2022/02/11
390	>	- correction of position index below line of sight after Takuro Kikuchi's comments in radiance-discourse from Dec 2021.
391	>	*/
392	>
393	>	/* evalglare.c, v3.03  2022/03/18, 2024/06/25
394	>	- add no pixels output for zonal analysis.
395	>
396	>	/* evalglare.c, v3.04  2023/09/01
397	>	- test version to include peripherical dependency, changes not (yet) used for following versions
398	>
399	>	/* evalglare.c, v3.05  2024/06/25
400	>	- fix bug of still having lowlight correction even if turned off
401	>	- changing abs_max,Lveil from float to double
402	>	*/
403	>
404	>
405		#define EVALGLARE
406		#define PROGNAME "evalglare"
407	<	#define VERSION "2.10 release 25.06.2020 by EPFL, J.Wienold"
407	>	#define VERSION "3.05 release 25.06.2024 by J.Wienold, EPFL"
408		#define RELEASENAME PROGNAME " " VERSION
409
410
#	Line 370 | Line 415 | calculate "illuminance-contribution of zones"
415		#include "platform.h"
416		#include "muc_randvar.h"
417
373	–	char *progname;
374	–
418		/* subroutine to add a pixel to a glare source */
419		void add_pixel_to_gs(pict * p, int x, int y, int gsn)
420		{
421		double old_av_posx, old_av_posy, old_av_lum, old_omega, act_omega,
422	<	new_omega, act_lum;
422	>	new_omega, act_lum,temp_av_posx,temp_av_posy,av_lum;
423
424
425		pict_get_npix(p, gsn) = pict_get_npix(p, gsn) + 1;
#	Line 388 | Line 431 | void add_pixel_to_gs(pict * p, int x, int y, int gsn)
431		act_omega = pict_get_omega(p, x, y);
432		act_lum = luminance(pict_get_color(p, x, y));
433		new_omega = old_omega + act_omega;
434	<	pict_get_av_posx(p, gsn) =
435	<	(old_av_posx * old_omega + x * act_omega) / new_omega;
436	<	pict_get_av_posy(p, gsn) =
437	<	(old_av_posy * old_omega + y * act_omega) / new_omega;
434	>	pict_get_av_lum(p, gsn) =
435	>	(old_av_lum * old_omega + act_lum * act_omega) / new_omega;
436	>
437	>	av_lum=pict_get_av_lum(p, gsn);
438	>	temp_av_posx =
439	>	(old_av_posx *  old_omega* old_av_lum + x * act_omega*act_lum) / (old_av_lum*old_omega + act_lum* act_omega );
440	>	pict_get_av_posx(p, gsn) = temp_av_posx;
441	>	temp_av_posy =
442	>	(old_av_posy *  old_omega* old_av_lum + y * act_omega*act_lum) / (old_av_lum*old_omega + act_lum* act_omega );
443	>
444	>	pict_get_av_posy(p, gsn) = temp_av_posy;
445		if (isnan((pict_get_av_posx(p, gsn))))
446		fprintf(stderr,"error in add_pixel_to_gs %d %d %f %f %f %f\n", x, y, old_av_posy, old_omega, act_omega, new_omega);
447
398	–	pict_get_av_lum(p, gsn) =
399	–	(old_av_lum * old_omega + act_lum * act_omega) / new_omega;
448		pict_get_av_omega(p, gsn) = new_omega;
449		pict_get_gsn(p, x, y) = gsn;
450		if (act_lum < pict_get_lum_min(p, gsn)) {
#	Line 771 | Line 819 | void split_pixel_from_gs(pict * p, int x, int y, int n
819		{
820		int old_gsn, icol;
821		double old_av_posx, old_av_posy, old_av_lum, old_omega, act_omega, delta_E,
822	<	new_omega, act_lum;
822	>	new_omega, act_lum,temp_av_posx,temp_av_posy,av_lum;
823
824
825		/* change existing gs */
#	Line 788 | Line 836 | void split_pixel_from_gs(pict * p, int x, int y, int n
836
837		new_omega = old_omega - act_omega;
838		pict_get_av_omega(p, old_gsn) = new_omega;
791	–	pict_get_av_posx(p, old_gsn) =
792	–	(old_av_posx * old_omega - x * act_omega) / new_omega;
793	–	pict_get_av_posy(p, old_gsn) =
794	–	(old_av_posy * old_omega - y * act_omega) / new_omega;
839
796	–
840		act_lum = luminance(pict_get_color(p, x, y));
841		old_av_lum = pict_get_av_lum(p, old_gsn);
842		pict_get_av_lum(p, old_gsn) =
843		(old_av_lum * old_omega - act_lum * act_omega) / new_omega;
844	+
845	+	av_lum = pict_get_av_lum(p, old_gsn);
846	+	temp_av_posx =
847	+	(old_av_posx *old_av_lum* old_omega  - x *act_lum* act_omega ) / (old_av_lum*old_omega  - act_lum* act_omega);
848	+
849	+	pict_get_av_posx(p, old_gsn) = temp_av_posx;
850	+	temp_av_posy =
851	+	(old_av_posy *old_av_lum* old_omega - y *act_lum* act_omega ) / (old_av_lum*old_omega  - act_lum* act_omega);
852	+	pict_get_av_posy(p, old_gsn) = temp_av_posy;
853	+
854		/* add pixel to new  gs */
855
856		add_pixel_to_gs(p, x, y, new_gsn);
#	Line 816 | Line 869 | void split_pixel_from_gs(pict * p, int x, int y, int n
869		float get_posindex(pict * p, float x, float y, int postype)
870		{
871		float posindex;
872	<	double teta, phi, sigma, tau, deg, d, s, r, fact;
872	>	double teta, beta, phi, sigma, tau, deg, d, s, r, fact;
873
874
875		pict_get_vangle(p, x, y, p->view.vdir, p->view.vup, &phi);
#	Line 844 | Line 897 | float get_posindex(pict * p, float x, float y, int pos
897		/* KIM  model */
898		posindex = exp ((sigma-(-0.000009*tau*tau*tau+0.0014*tau*tau+0.0866*tau+21.633))/(-0.000009*tau*tau*tau+0.0013*tau*tau+0.0853*tau+8.772));
899		}else{
900	+
901		/* Guth model, equation from IES lighting handbook */
902		posindex =
903		exp((35.2 - 0.31889 * tau -
#	Line 852 | Line 906 | float get_posindex(pict * p, float x, float y, int pos
906		0.002963 * tau *
907		tau) / 100000 *
908		sigma * sigma);
855	–	/* below line of sight, using Iwata model */
856	–	if (phi < 0) {
857	–	d = 1 / tan(phi);
858	–	s = tan(teta) / tan(phi);
859	–	r = sqrt(1 / d * 1 / d + s * s / d / d);
860	–	if (r > 0.6)
861	–	fact = 1.2;
862	–	if (r > 3) {
863	–	fact = 1.2;
864	–	r = 3;
865	–	}
909
910	<	posindex = 1 + fact * r;
910	>	/* below line of sight, using Iwata model, CIE2010, converted coordinate system according to Takuro Kikuchi */
911	>
912	>	if (phi < 0) {
913	>	beta = atan(tan(sigma/deg)* sqrt(1 + 0.3225 * pow(cos(tau/deg),2))) * deg;
914	>	posindex = exp(6.49 / 1000 * beta + 21.0 / 100000 * beta * beta);
915	>
916		}
917	+
918		if (posindex > 16)
919		posindex = 16;
920		}
#	Line 1159 | Line 1208 | get_dgp(pict * p, double E_v, int igs, double a1, doub
1208		pict_get_av_posy(p, i),
1209		posindex_2),
1210		a4) * pow(pict_get_av_omega(p, i), a2);
1211	<	/*                      printf("i,sum_glare %i %f\n",i,sum_glare);*/
1211	>	/*printf("i,sum_glare %i %f\n",i,sum_glare);    */
1212		}
1213		}
1214		dgp =
#	Line 1313 | Line 1362 | float get_ugp(pict * p, double lum_backg, int igs, int
1362		return ugp;
1363
1364		}
1365	+	/* subroutine for the calculation of the updated unified glare probability (Hirning 2016)*/
1366	+	float get_ugp2(pict * p, double lum_backg, int igs, int posindex_2)
1367	+	{
1368	+	float ugp;
1369	+	double sum_glare,ugp2;
1370	+	int i, i_glare;
1371
1372
1373	+	sum_glare = 0;
1374	+	i_glare = 0;
1375	+	for (i = 0; i <= igs; i++) {
1376	+
1377	+	if (pict_get_npix(p, i) > 0) {
1378	+	i_glare = i_glare + 1;
1379	+	sum_glare +=
1380	+	pow(pict_get_av_lum(p, i) /
1381	+	get_posindex(p, pict_get_av_posx(p, i),
1382	+	pict_get_av_posy(p, i), posindex_2),
1383	+	2) * pict_get_av_omega(p, i);
1384	+
1385	+	}
1386	+	}
1387	+	ugp2 = 1/pow(1.0+2.0/7.0*pow(sum_glare/lum_backg,-0.2),10.0);
1388	+
1389	+	return ugp2;
1390	+
1391	+	}
1392	+
1393	+
1394		/* subroutine for the calculation of the disability glare according to Poynter */
1395		float get_disability(pict * p, double lum_backg, int igs)
1396		{
#	Line 1457 | Line 1533 | int main(int argc, char **argv)
1533		pict *p = pict_create();
1534		pict *pm = pict_create();
1535		pict *pcoeff = pict_create();
1536	<	int     lowlight,skip_second_scan,calcfast,age_corr,cut_view,cut_view_type,calc_vill, output, detail_out2, x1,y1, fill, yfillmax, yfillmin,
1537	<	ext_vill, set_lum_max, set_lum_max2, img_corr,x_disk,y_disk,task_color, i_splitstart,zones,act_gsn,splitgs,j,multi_image_mode,
1536	>	int     add,i1,i2,y_lines,ix_offset,x_offset,y_offset, patchmode,ix, iy, patch_pixdistance_x, patch_pixdistance_y,nx_patch,ny_patch, lowlight,skip_second_scan,
1537	>	calcfast,age_corr,cut_view,cut_view_type,calc_vill, output, detail_out2, x1,y1, fill, yfillmax, yfillmin,
1538	>	ext_vill, set_lum_max, set_lum_max2, img_corr,x_disk,y_disk,task_color, i_splitstart,zones,act_gsn,splitgs,j,jj,multi_image_mode,
1539		i_split, posindex_2, task_lum, checkfile, rval, i, i_max, x, y,x2,y2,x_zone,y_zone, i_z1, i_z2, thres_activate,num_images,xmap,ymap,
1540		igs, actual_igs, lastpixelwas_gs, icol, xt, yt, change,checkpixels, before_igs, sgs, splithigh,uniform_gs,x_max, y_max,y_mid,
1541	<	detail_out, posindex_picture, non_cos_lb, rx, ry,lastpixelwas_peak, rmx,rmy,apply_disability,band_calc,band_color,masking,i_mask,no_glaresources,force;
1542	<	double  LUM_replace,lum_total_max,age_corr_factor,age,dgp_ext,dgp,low_light_corr,omega_cos_contr, setvalue, lum_ideal, E_v_contr, sigma,om,delta_E,
1543	<	E_vl_ext, lum_max, new_lum_max, r_center, ugp, ugr_exp, dgi_mod,lum_a, E_v_mask,angle_disk,dist,n_corner_px,zero_corner_px,
1541	>	detail_out, posindex_picture, non_cos_lb, rx, ry,lastpixelwas_peak, rmx,rmy,apply_disability,band_calc,band_color,masking,i_mask,no_glaresources,force,num_scans;
1542	>	double  abs_max,Lveil,xxx,angle_v,angle_h,patch_angle, r_contrast,r_dgp,r_glare,sum_glare, LUM_replace,lum_total_max,age_corr_factor,age,dgp_ext,dgp,low_light_corr,omega_cos_contr, setvalue,
1543	>	lum_ideal, E_v_contr, sigma,om,delta_E,
1544	>	E_vl_ext, lum_max, new_lum_max, r_center, ugp,ugp2, ugr_exp, dgi_mod,lum_a, E_v_mask,angle_disk,dist,n_corner_px,zero_corner_px,
1545		search_pix, a1, a2, a3, a4, a5, c3, c1, c2, r_split, max_angle,r_actual,lum_actual,dir_ill,
1546		omegat, sang,Ez1,Ez2, E_v, E_v2, E_v_dir, avlum, act_lum, ang, angle_z1, angle_z2,per_95_band,per_75_band,pos,
1547		l_max, lum_backg, lum_backg_cos, omega_sources, lum_sources,per_75_mask,per_95_mask,per_75_z1,per_95_z1,per_75_z2,per_95_z2,
#	Line 1473 | Line 1551 | int main(int argc, char **argv)
1551		lum_z1[1],lum_z1_av,lum_z1_std[1],lum_z1_median[1],omega_z1,bbox_z1[2],
1552		lum_z2[1],lum_z2_av,lum_z2_std[1],lum_z2_median[1],omega_z2,bbox_z2[2],
1553		lum_pos[1],lum_nopos_median[1],lum_pos_median[1],lum_pos2_median[1],lum_pos_mean,lum_pos2_mean;
1554	<	float lum_task, lum_thres, dgi,  vcp, cgi, ugr, limit, dgr,pgsv ,pgsv_sat,pgsv_con,
1477	<	abs_max, Lveil;
1554	>	float lum_task, lum_thres, dgi,  vcp, cgi, ugr, limit, dgr,pgsv ,pgsv_sat,pgsv_con;
1555		char maskfile[500],file_out[500], file_out2[500], version[500],correction_type[500];
1556		char *cline;
1557		char** temp_image_name;
1558	<	int *x_temp_img, *y_temp_img;
1558	>	int *x_temp_img, *y_temp_img;
1559	>	double *scale_image_scans;
1560		VIEW userview = STDVIEW;
1561		int gotuserview = 0;
1562
#	Line 1516 | Line 1594 | int main(int argc, char **argv)
1594		muc_rvar_clear(s_posweight2);
1595
1596		/*set required user view parameters to invalid values*/
1597	<	lowlight=1;
1597	>	patchmode=0;
1598	>	patch_angle=25.0;
1599	>	patch_pixdistance_x=0;
1600	>	patch_pixdistance_y=0;
1601	>	lowlight=0;
1602		multi_image_mode=0;
1603		lastpixelwas_peak=0;
1604		num_images=0;
#	Line 1613 | Line 1695 | int main(int argc, char **argv)
1695		set_lum_max2 = 0;
1696		img_corr=0;
1697		abs_max = 0;
1698	<	progname = argv[0];
1698	>	fixargv0(argv[0]);
1699		E_v_contr = 0.0;
1700	<	strcpy(version, "1.19 release 09.12.2015 by J.Wienold");
1700	>	strcpy(version, "3.05 release 25.06.2024 by J.Wienold");
1701		low_light_corr=1.0;
1702		output = 0;
1703		calc_vill = 0;
#	Line 1695 | Line 1777 | int main(int argc, char **argv)
1777		case 'r':
1778		max_angle = atof(argv[++i]);
1779		break;
1780	+	case 'z':
1781	+	patch_angle = atof(argv[++i]);
1782	+	patchmode= atoi(argv[++i]);
1783	+	if ( patchmode == 3) { output=4;}
1784	+
1785	+	/* patchmode = 0 : deactivated; patchmode =1: patch without combining, normal output; patchmode =3: patch without combining, coefficient output; patchmode =2 patch with combining (not yet implemented...) */
1786	+	break;
1787	+
1788		case 's':
1789		sgs = 1;
1790		break;
#	Line 1889 | Line 1979 | int main(int argc, char **argv)
1979		output= 3;
1980		calcfast=1;
1981		num_images =atoi(argv[++i]);
1982	+	num_scans =atoi(argv[++i]);
1983		temp_image_name = malloc(sizeof(char*)*num_images);
1984
1985		x_temp_img=(int *) malloc(sizeof(int) * num_images);
1986		y_temp_img=(int *) malloc(sizeof(int) * num_images);
1987	<
1897	<
1987	>	scale_image_scans=(double *) malloc(sizeof(double) * (num_scans+1)*num_images);
1988		/* iterate through all images and allocate 256 characters to each: */
1989		for (j = 0; j < num_images; j++) {
1990	+	scale_image_scans[j*(num_scans+1)]=1.0;
1991		temp_image_name[j] = malloc(256*sizeof(char));
1992		strcpy(temp_image_name[j], argv[++i]);
1993		x_temp_img[j] = atoi(argv[++i]);
1994		y_temp_img[j] = atoi(argv[++i]);
1995	+	for (jj=1;jj<=num_scans;jj++){
1996	+	scale_image_scans[j*(num_scans+1)+jj]=atof(argv[++i]);}
1997		}
1998
1999
#	Line 1934 | Line 2027 | int main(int argc, char **argv)
2027		}
2028
2029		/* set multiplier for task method to 5, if not specified */
2030	+
2031
2032	+
2033		if ( task_lum == 1 && thres_activate == 0){
2034		lum_thres = 5.0;
2035		}
#	Line 2002 | Line 2097 | if (masking ==1 && zones >0) {
2097		exit(1);
2098		}
2099
2100	+	if ( patchmode > 0 && p->view.type != VT_ANG) {
2101	+
2102	+	fprintf(stderr, "error: Patchmode only possible with view type vta  !  Stopping... \n");
2103	+	exit(1);
2104	+
2105	+	}
2106	+
2107	+
2108		if (p->view.type == VT_PER) {
2109		fprintf(stderr, "warning: image has perspective view type specified in header ! \n");
2110		}
#	Line 2358 | Line 2461 | if (cut_view==1) {
2461		/*     printf("Ev, avlum, Omega_tot%f %f %f \n",E_v, avlum, sang); */
2462
2463		/* first glare source scan: find primary glare sources */
2464	+
2465	+	if (patchmode==0) {
2466		for (x = 0; x < pict_get_xsize(p); x++) {
2467		lastpixelwas_gs=0;
2468		/*              lastpixelwas_peak=0; */
#	Line 2400 | Line 2505 | if (cut_view==1) {
2505		}
2506		}
2507		}
2508	<	/*      pict_write(p,"firstscan.pic");   */
2508	>	} else {
2509	>	/* patchmode on!
2510	>	calculation only for angular projection!
2511
2512	+	*/
2513
2514
2515	+	angle_v=p->view.vert;
2516	+	angle_h=p->view.horiz;
2517
2518	<	if (calcfast ==1 || search_pix <= 1.0 || calcfast == 2 ) {
2518	>
2519	>	/*printf ("angle_v,angle_h: %f %f \n",angle_v,angle_h) ;
2520	>
2521	>	setting up patches as glare sources */
2522	>
2523	>	patch_pixdistance_x=floor(pict_get_xsize(p)/angle_h*patch_angle);
2524	>	patch_pixdistance_y=floor(pict_get_ysize(p)/angle_v*patch_angle);
2525	>
2526	>	nx_patch=floor(angle_v/patch_angle)+1;
2527	>	ny_patch=floor(angle_h/patch_angle)+1;
2528	>
2529	>	y_offset=floor (patch_pixdistance_y/2);
2530	>	x_offset=floor (patch_pixdistance_x/2);
2531	>	/* printf ("nx_patch,ny_patch,x_offset,y_offset,patch_pixdistance_x,patch_pixdistance_y   %i %i %i %i %i %i\n",nx_patch,ny_patch,x_offset,y_offset,patch_pixdistance_x,patch_pixdistance_y) ; */
2532	>
2533	>	ix_offset=0;
2534	>	for (iy=1; iy<=ny_patch;iy++) {
2535	>
2536	>
2537	>
2538	>	for (ix=1; ix<=nx_patch;ix++) {
2539	>	igs = igs + 1;
2540	>	pict_new_gli(p);
2541	>
2542	>	pict_get_lum_min(p, igs) = HUGE_VAL;
2543	>	pict_get_Eglare(p,igs) = 0.0;
2544	>	pict_get_Dglare(p,igs) = 0.0;
2545	>	pict_get_z1_gsn(p,igs) = 0;
2546	>	pict_get_z2_gsn(p,igs) = 0;
2547	>	pict_get_dx_max(p,igs) = (x_offset+ix_offset*x_offset+(ix-1)*patch_pixdistance_x)*1.0;
2548	>	pict_get_dy_max(p,igs) = (y_offset+(iy-1)*patch_pixdistance_y)*1.0;
2549	>
2550	>	/* printf ("igs, x-patch, y-patch : %i %f %f \n",igs,pict_get_dx_max(p,igs),pict_get_dy_max(p,igs) ) ; */
2551	>
2552	>	}
2553	>	ix_offset=ix_offset+1;
2554	>	if (ix_offset==2) {
2555	>	ix_offset =0 ;
2556	>	}
2557	>
2558	>	}
2559	>	for (y = 0; y < pict_get_ysize(p); y++) {
2560	>	for (x = 0; x < pict_get_xsize(p); x++) {
2561	>
2562	>	if (pict_get_hangle(p, x, y, p->view.vdir, p->view.vup, &ang)) {
2563	>	if (pict_is_validpixel(p, x, y)) {
2564	>	act_lum = luminance(pict_get_color(p, x, y));
2565	>	if (act_lum > lum_source) {
2566	>	if (act_lum >lum_total_max) {
2567	>	lum_total_max=act_lum;
2568	>	}
2569	>
2570	>	y_lines = floor((y)/patch_pixdistance_y);
2571	>	xxx = (x+0.0)/(patch_pixdistance_x+0.0)-0.5*(y_lines % 2);
2572	>	if (xxx<0 ) { xxx=0.0 ;}
2573	>	i1 = y_lines*(nx_patch)+floor(xxx)+1;
2574	>	i2=0;
2575	>	add=0;
2576	>	if (y_lines % 2 == 1 ) {add=1;}
2577	>
2578	>	if (y >pict_get_dy_max(p,i1)) {
2579	>
2580	>	if (x > pict_get_dx_max(p,i1)) {
2581	>	i2=i1+nx_patch+add;
2582	>	}else {
2583	>	i2=i1+nx_patch-1+add;
2584	>	}
2585	>	}else {
2586	>
2587	>	if (x > pict_get_dx_max(p,i1)) {
2588	>	i2=i1-nx_patch+add;
2589	>	}else {
2590	>	i2=i1-nx_patch-1+add;
2591	>	}
2592	>	}
2593	>
2594	>
2595	>
2596	>
2597	>	if (i2 > igs || i2 < 1) {actual_igs=i1;}else{
2598	>	if ( ((x-pict_get_dx_max(p,i1))*(x-pict_get_dx_max(p,i1))+(y-pict_get_dy_max(p,i1))*(y-pict_get_dy_max(p,i1))) < ((x-pict_get_dx_max(p,i2))*(x-pict_get_dx_max(p,i2))+(y-pict_get_dy_max(p,i2))*(y-pict_get_dy_max(p,i2))) ) {
2599	>	actual_igs=i1; }else {actual_igs=i2;}}
2600	>
2601	>
2602	>	pict_get_gsn(p, x, y) = actual_igs;
2603	>	pict_get_pgs(p, x, y) = 1;
2604	>	add_pixel_to_gs(p, x, y, actual_igs);
2605	>	/*                      setglcolor(p, x, y, actual_igs, uniform_gs, u_r, u_g , u_b); */
2606	>	}
2607	>	}
2608	>	}
2609	>
2610	>
2611	>
2612	>
2613	>
2614	>	}               }
2615	>
2616	>
2617	>
2618	>
2619	>	}
2620	>	/*                    pict_write(p,"firstscan.pic");   */
2621	>
2622	>
2623	>
2624	>
2625	>	if (calcfast ==1 || search_pix <= 1.0 || calcfast == 2 || patchmode > 0) {
2626		skip_second_scan=1;
2627		}
2628
#	Line 2649 | Line 2866 | if (calcfast ==1 || search_pix <= 1.0 || calcfast == 2
2866		i=0;
2867		for (x = 0; x <= igs; x++) {
2868		if (pict_get_npix(p, x) > 0) {
2869	+	sum_glare += pow(pict_get_av_lum(p, x),2.0)* pict_get_av_omega(p, x)/pow(get_posindex(p, pict_get_av_posx(p, x), pict_get_av_posy(p, x),posindex_2), 2.0);
2870		lum_sources += pict_get_av_lum(p, x) * pict_get_av_omega(p, x);
2871		omega_sources += pict_get_av_omega(p, x);
2872		i=i+1;
2873		}}
2874	<
2874	>	sum_glare= c2*log10(1 + sum_glare / pow(E_v, a3));
2875		if (sang == omega_sources) {
2876		lum_backg =avlum;
2877		} else {
#	Line 2771 | Line 2989 | if (calcfast ==1 || search_pix <= 1.0 || calcfast == 2
2989		omega_z1 += pict_get_omega(p, x, y);
2990		lum_z1_av += pict_get_omega(p, x, y)* lum_actual;
2991		Ez1 += DOT(p->view.vdir, pict_get_cached_dir(p, x, y))* pict_get_omega(p, x, y)* lum_actual;
2774	–
2992		setglcolor(p,x,y,1,1 , 0.66, 0.01 ,0.33);
2993		/*check if separation gsn already exist */
2994
#	Line 2851 | Line 3068 | if (calcfast ==1 || search_pix <= 1.0 || calcfast == 2
3068		muc_rvar_get_bounding_box(s_z1,bbox_z1);
3069		if (detail_out == 1) {
3070
3071	<	printf ("zoning:z1_omega,z1_av_lum,z1_median_lum,z1_std_lum,z1_perc_75,z1_perc_95,z1_lum_min,z1_lum_max,Ez1: %f %f %f %f %f %f %f %f %f\n",omega_z1,lum_z1_av,lum_z1_median[0],sqrt(lum_z1_std[0]),per_75_z1,per_95_z1,bbox_z1[0],bbox_z1[1],Ez1 );
3071	>	printf ("zoning:z1_omega,z1_av_lum,z1_median_lum,z1_std_lum,z1_perc_75,z1_perc_95,z1_lum_min,z1_lum_max,Ez1,i_z1: %f %f %f %f %f %f %f %f %f %i\n",omega_z1,lum_z1_av,lum_z1_median[0],sqrt(lum_z1_std[0]),per_75_z1,per_95_z1,bbox_z1[0],bbox_z1[1],Ez1,i_z1 );
3072
3073		if (zones == 2 ) {
3074
3075	<	printf ("zoning:z2_omega,z2_av_lum,z2_median_lum,z2_std_lum,z2_perc_75,z2_perc_95,z2_lum_min,z2_lum_max,Ez1:  %f %f %f %f %f %f %f %f %f\n",omega_z2,lum_z2_av,lum_z2_median[0],sqrt(lum_z2_std[0]),per_75_z2,per_95_z2,bbox_z2[0],bbox_z2[1],Ez2 );
3075	>	printf ("zoning:z2_omega,z2_av_lum,z2_median_lum,z2_std_lum,z2_perc_75,z2_perc_95,z2_lum_min,z2_lum_max,Ez2,i_z2:  %f %f %f %f %f %f %f %f %f %i\n",omega_z2,lum_z2_av,lum_z2_median[0],sqrt(lum_z2_std[0]),per_75_z2,per_95_z2,bbox_z2[0],bbox_z2[1],Ez2,i_z1 );
3076		} }
3077
3078		}
3079
3080	+	int new_gs_number[igs+1];
3081	+
3082		i = 0;
3083		for (x = 0; x <= igs; x++) {
3084		/* resorting glare source numbers */
3085		if (pict_get_npix(p, x) > 0) {
3086		i = i + 1;
3087	+	pict_get_Dglare(p,x) = i;
3088	+	new_gs_number[x] = i;
3089	+	/*                      printf("%i %i %f %i \n", i,x,pict_get_Dglare(p,x),new_gs_number[x] ); */
3090		}
3091		}
3092		no_glaresources=i;
3093		/*printf("%i",no_glaresources );*/
3094		/* glare sources */
2873	–	if (detail_out == 1 && output != 3) {
3095
3096	+	if (output == 4 ) {
3097	+
3098	+	i=0;
3099	+	for (x = 0; x <= igs; x++) {
3100	+	if (pict_get_npix(p, x) > 0) {
3101	+	i = i + 1;
3102	+
3103	+	x2=pict_get_av_posx(p, x);
3104	+	y2=pict_get_av_posy(p, x);
3105	+
3106	+	printf("%i %f %f %f %f %.10f %f %f %f %f \n",
3107	+	i, pict_get_npix(p, x), pict_get_av_posx(p, x), pict_get_av_posy(p, x),
3108	+	pict_get_av_lum(p, x), pict_get_av_omega(p, x),
3109	+	get_posindex(p, pict_get_av_posx(p, x),pict_get_av_posy(p, x),posindex_2),
3110	+	pict_get_cached_dir(p, x2,y2)[0],pict_get_cached_dir(p, x2,y2)[1],pict_get_cached_dir(p, x2,y2)[2]);
3111	+	}
3112	+	}
3113	+
3114	+
3115	+	for (y = 0; y < pict_get_ysize(p); y++) {
3116	+	for (x = 0; x < pict_get_xsize(p); x++) {
3117	+
3118	+	if (pict_get_hangle(p, x, y, p->view.vdir, p->view.vup, &ang)) {
3119	+	if (pict_is_validpixel(p, x, y)) {
3120	+	if (pict_get_gsn(p,x,y) >0 ) {
3121	+	i=pict_get_gsn(p,x,y);
3122	+	printf("%i %i %f %f %f \n", i, new_gs_number[i], pict_get_cached_dir(p, x,y)[0],pict_get_cached_dir(p, x,y)[1],pict_get_cached_dir(p, x,y)[2] );
3123	+
3124	+	}
3125	+
3126	+
3127	+
3128	+	}}}}
3129	+
3130	+
3131	+	}
3132	+
3133	+
3134	+
3135	+
3136	+	if (detail_out == 1 && output < 3) {
3137	+	dgp = get_dgp(p, E_v, igs, a1, a2, a3, a4, a5, c1, c2, c3, posindex_2);
3138	+
3139		printf
3140	<	("%i No pixels x-pos y-pos L_s Omega_s Posindx L_b L_t E_vert Edir Max_Lum Sigma xdir ydir zdir Eglare_cie Lveil_cie teta glare_zone\n",
3140	>	("%i No pixels x-pos y-pos L_s Omega_s Posindx L_b L_t E_v Edir Max_Lum Sigma xdir ydir zdir Eglare Lveil_cie teta glare_zone r_contrast r_dgp\n",
3141		i);
3142		if (i == 0) {
3143	<	printf("%i %f %f %f %f %.10f %f %f %f %f %f %f %f %f %f %f %f %f %f %f %f\n", i, 0.0, 0.0,
3144	<	0.0, 0.0, 0.0, 0.0, lum_backg, lum_task, E_v, E_v_dir,abs_max,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0);
3143	>	printf("%i %f %f %f %f %.10f %f %f %f %f %f %f %f %f %f %f %f %f %f %f %f %f %f\n", i, 0.0, 0.0,
3144	>	0.0, 0.0, 0.0, 0.0, lum_backg, lum_task, E_v, E_v_dir,abs_max,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0);
3145
3146		} else {
3147		i = 0;
#	Line 2897 | Line 3161 | if (calcfast ==1 || search_pix <= 1.0 || calcfast == 2
3161		Lveil_cie =0 ;
3162		}
3163		Lveil_cie_sum =  Lveil_cie_sum + Lveil_cie;
3164	+	r_glare= c2*log10(1 + pow(pict_get_av_lum(p, x),2)* pict_get_av_omega(p, x)/pow(get_posindex(p, pict_get_av_posx(p, x), pict_get_av_posy(p, x),posindex_2), 2.0) / pow(E_v, a3))  ;
3165	+	r_contrast=r_glare/sum_glare  ;
3166	+	r_dgp=r_glare/dgp ;
3167		if (pict_get_z1_gsn(p,x)<0) {
3168		act_gsn=(int)(-pict_get_z1_gsn(p,x));
3169		}else{
3170		act_gsn=0;
3171		}
3172	<	printf("%i %f %f %f %f %.10f %f %f %f %f %f %f %f %f %f %f %f %f %f %i \n",
3172	>	printf("%i %f %f %f %f %.10f %f %f %f %f %f %f %f %f %f %f %f %f %f %i %f %f \n",
3173		i, pict_get_npix(p, x), pict_get_av_posx(p, x),
3174		pict_get_ysize(p) - pict_get_av_posy(p, x),
3175		pict_get_av_lum(p, x), pict_get_av_omega(p, x),
#	Line 2910 | Line 3177 | if (calcfast ==1 || search_pix <= 1.0 || calcfast == 2
3177		pict_get_av_posy(p, x),
3178		posindex_2), lum_backg, lum_task,
3179		E_v, E_v_dir, abs_max, sigma * 180 / 3.1415927
3180	<	,pict_get_cached_dir(p, x2,y2)[0],pict_get_cached_dir(p, x2,y2)[1],pict_get_cached_dir(p, x2,y2)[2],pict_get_Eglare(p,x),Lveil_cie,teta,act_gsn );
3180	>	,pict_get_cached_dir(p, x2,y2)[0],pict_get_cached_dir(p, x2,y2)[1],pict_get_cached_dir(p, x2,y2)[2],pict_get_Eglare(p,x),Lveil_cie,teta,act_gsn,r_contrast,r_dgp );
3181		}
3182		}
3183		}
3184		}
3185
3186	<	if ( output != 3) {
3186	>	if ( output < 3) {
3187
3188		/* calculation of indicees */
3189
#	Line 2955 | Line 3222 | if (calcfast == 0) {
3222		dgi = get_dgi(p, lum_backg, igs, posindex_2);
3223		ugr = get_ugr(p, lum_backg, igs, posindex_2);
3224		ugp = get_ugp (p,lum_backg, igs, posindex_2);
3225	+	ugp2 = get_ugp2 (p,lum_backg, igs, posindex_2);
3226		ugr_exp = get_ugr_exp (p,lum_backg_cos,lum_a, igs, posindex_2);
3227		dgi_mod = get_dgi_mod(p, lum_a, igs, posindex_2);
3228		cgi = get_cgi(p, E_v, E_v_dir, igs, posindex_2);
#	Line 2965 | Line 3233 | if (calcfast == 0) {
3233		dgi = 0.0;
3234		ugr = 0.0;
3235		ugp = 0.0;
3236	+	ugp2 =0.0;
3237		ugr_exp = 0.0;
3238		dgi_mod = 0.0;
3239		cgi = 0.0;
#	Line 2991 | Line 3260 | if (calcfast == 0) {
3260		get_dgp(p, E_vl_ext, igs, a1, a2, a3, a4, a5, c1, c2, c3,
3261		posindex_2);
3262		dgp = dgp_ext;
3263	<	if (E_vl_ext < 1000) {
3263	>	if (E_vl_ext < 1000 && lowlight ==1) {
3264		low_light_corr=1.0*exp(0.024*E_vl_ext-4)/(1+exp(0.024*E_vl_ext-4));} else {low_light_corr=1.0 ;}
3265		dgp =low_light_corr*dgp;
3266		dgp =age_corr_factor*dgp;
#	Line 3004 | Line 3273 | if (calcfast == 0) {
3273
3274
3275		printf
3276	<	("dgp,av_lum,E_v,lum_backg,E_v_dir,dgi,ugr,vcp,cgi,lum_sources,omega_sources,Lveil,Lveil_cie,dgr,ugp,ugr_exp,dgi_mod,av_lum_pos,av_lum_pos2,med_lum,med_lum_pos,med_lum_pos2: %f %f %f %f %f %f %f %f %f %f %f %f %f %f %f %f %f %f %f %f %f %f\n",
3276	>	("dgp,av_lum,E_v,lum_backg,E_v_dir,dgi,ugr,vcp,cgi,lum_sources,omega_sources,Lveil,Lveil_cie,dgr,ugp,ugr_exp,dgi_mod,av_lum_pos,av_lum_pos2,med_lum,med_lum_pos,med_lum_pos2,ugp2: %f %f %f %f %f %f %f %f %f %f %f %f %f %f %f %f %f %f %f %f %f %f %f\n",
3277		dgp, avlum, E_v, lum_backg, E_v_dir, dgi, ugr, vcp, cgi,
3278	<	lum_sources, omega_sources, Lveil,Lveil_cie_sum,dgr,ugp,ugr_exp,dgi_mod,lum_pos_mean,lum_pos2_mean/sang,lum_nopos_median[0],lum_pos_median[0],lum_pos2_median[0]);
3278	>	lum_sources, omega_sources, Lveil,Lveil_cie_sum,dgr,ugp,ugr_exp,dgi_mod,lum_pos_mean,lum_pos2_mean/sang,lum_nopos_median[0],lum_pos_median[0],lum_pos2_median[0],ugp2);
3279		} else {
3280		if (detail_out2 == 1) {
3281
#	Line 3019 | Line 3288 | if (calcfast == 0) {
3288		if (ext_vill == 1) {
3289		dgp_ext = get_dgp(p, E_vl_ext, igs, a1, a2, a3, a4, a5, c1, c2, c3,posindex_2);
3290
3291	<	if (E_vl_ext < 1000) {
3291	>	if (E_vl_ext < 1000 && lowlight ==1) {
3292		low_light_corr=1.0*exp(0.024*E_vl_ext-4)/(1+exp(0.024*E_vl_ext-4));} else {low_light_corr=1.0 ;}
3293		dgp =low_light_corr*dgp_ext;
3294		dgp =age_corr_factor*dgp;
#	Line 3034 | Line 3303 | if (calcfast == 0) {
3303		get_dgp(p, E_vl_ext, igs, a1, a2, a3, a4, a5, c1, c2, c3,
3304		posindex_2);
3305		dgp = dgp_ext;
3306	<	if (E_vl_ext < 1000) {
3306	>	if (E_vl_ext < 1000 && lowlight ==1) {
3307		low_light_corr=1.0*exp(0.024*E_vl_ext-4)/(1+exp(0.024*E_vl_ext-4)); } else {low_light_corr=1.0 ;}
3308		dgp =low_light_corr*dgp;
3309
#	Line 3050 | Line 3319 | if (calcfast == 0) {
3319		}
3320
3321		}else{
3322	<	/* only multiimagemode */
3322	>	/* only multiimagemode
3323
3324	+	*/
3325
3326	+
3327		for (j = 0; j < num_images; j++) {
3328
3329
#	Line 3063 | Line 3334 | pict_read(pcoeff,temp_image_name[j] );
3334		/*printf ("num_img:%i x-size:%i xpos:%i y-size: %i ypos %i bigimg-xsize %i %i ",num_images,pict_get_xsize(pcoeff),x_temp_img[j],pict_get_ysize(pcoeff),y_temp_img[j],pict_get_xsize(p),pict_get_ysize(p));
3335		*/
3336
3337	+
3338	+	/* loop over scans
3339	+	empty of */
3340	+	for (jj=0;jj<=num_scans;jj++){
3341	+
3342	+	/*printf("scale %i %i %i %f ",j,jj,num_scans,scale_image_scans[j*(num_scans+1)+jj]); */
3343	+
3344	+
3345		/* copy luminance value into big image and remove glare sources*/
3346		for (x = 0; x < pict_get_xsize(pcoeff); x++) {
3347		for (y = 0; y < pict_get_ysize(pcoeff); y++) {
3348	<	xmap=x_temp_img[j]+x-1;
3349	<	ymap=y_temp_img[j]+y-1;
3348	>	xmap=x_temp_img[j]+x;
3349	>	ymap=y_temp_img[j]+y;
3350		if (xmap <0) { xmap=0;}
3351		if (ymap <0) { ymap=0;}
3352
3353	<	pict_get_color(p, xmap, ymap)[RED] = pict_get_color(pcoeff, x, y)[RED];
3354	<	pict_get_color(p, xmap, ymap)[GRN] = pict_get_color(pcoeff, x, y)[GRN];
3355	<	pict_get_color(p, xmap, ymap)[BLU] = pict_get_color(pcoeff, x, y)[BLU];
3353	>	pict_get_color(p, xmap, ymap)[RED] = scale_image_scans[j*(num_scans+1)+jj]*pict_get_color(pcoeff, x, y)[RED];
3354	>	pict_get_color(p, xmap, ymap)[GRN] = scale_image_scans[j*(num_scans+1)+jj]*pict_get_color(pcoeff, x, y)[GRN];
3355	>	pict_get_color(p, xmap, ymap)[BLU] = scale_image_scans[j*(num_scans+1)+jj]*pict_get_color(pcoeff, x, y)[BLU];
3356		pict_get_gsn(p, xmap, ymap) = 0;
3357		pict_get_pgs(p, xmap, ymap) = 0;
3358		}}
3359
3360	+
3361	+
3362	+
3363	+
3364		actual_igs =0;
3365
3366		/* first glare source scan: find primary glare sources */
#	Line 3090 | Line 3373 | actual_igs =0;
3373		if (pict_get_hangle(p, xmap, ymap, p->view.vdir, p->view.vup, &ang)) {
3374		if (pict_is_validpixel(p, xmap, ymap)) {
3375		act_lum = luminance(pict_get_color(p, xmap, ymap));
3376	<	if (act_lum > lum_source) {
3376	>	if (act_lum> lum_source) {
3377		if (act_lum >lum_total_max) {
3378		lum_total_max=act_lum;
3379		}
#	Line 3306 | Line 3589 | printf("\n");
3589		igs=0;
3590
3591
3592	<
3592	>	}
3593
3594
3595		}

Diff Legend

–	Removed lines
+	Added lines
<	Changed lines (old)
>	Changed lines (new)