15 |
|
|
16 |
|
#define DEGREE (PI/180.) |
17 |
|
|
18 |
< |
#define MAXNT 180 /* maximum number of theta divisions */ |
18 |
> |
#define MAXNT 181 /* maximum number of theta divisions */ |
19 |
|
#define MAXNP 360 /* maximum number of phi divisions */ |
20 |
|
|
21 |
|
extern char *progname; /* global argv[0] */ |
77 |
|
int ec; |
78 |
|
{ |
79 |
|
if (ray_pnprocs > 0) /* close children if any */ |
80 |
< |
ray_pclose(0); |
80 |
> |
ray_pclose(0); |
81 |
> |
else if (ray_pnprocs < 0) |
82 |
> |
_exit(ec); /* avoid flush in child */ |
83 |
|
exit(ec); |
84 |
|
} |
85 |
|
|
211 |
|
{ |
212 |
|
int warnedneg; |
213 |
|
char linebuf[8192]; |
214 |
+ |
int last_pos_val = 0; |
215 |
|
int nelem = 1000; |
216 |
|
float *sarr = (float *)malloc(sizeof(float)*nelem); |
217 |
|
FILE *fp; |
239 |
|
cp = fskip(cp); |
240 |
|
if (cp == NULL) |
241 |
|
break; |
242 |
< |
if (ntp[1] > 1 && sarr[ntp[1]+1] <= sarr[ntp[1]]) { |
242 |
> |
if (ntp[1] > 1 && sarr[ntp[1]+1] <= sarr[ntp[1]]+FTINY) { |
243 |
|
sprintf(errmsg, |
244 |
|
"Phi values not monotinically increasing in sensor file '%s'", |
245 |
|
sfile); |
265 |
|
cp = fskip(cp); |
266 |
|
if (cp == NULL) |
267 |
|
break; |
268 |
< |
if (i && sarr[i] < .0) { |
268 |
> |
if (sarr[i] < .0) { |
269 |
|
if (!warnedneg++) { |
270 |
|
sprintf(errmsg, |
271 |
|
"Negative value(s) in sensor file '%s' (ignored)\n", sfile); |
272 |
|
error(WARNING, errmsg); |
273 |
|
} |
274 |
|
sarr[i] = .0; |
275 |
< |
} |
275 |
> |
} else if (sarr[i] > FTINY && i > ntp[0]*(ntp[1]+1)) |
276 |
> |
last_pos_val = i; |
277 |
|
++i; |
278 |
|
} |
279 |
< |
if (i == ntp[0]*(ntp[1]+1)) |
279 |
> |
if (i == ntp[0]*(ntp[1]+1)) /* empty line? */ |
280 |
|
break; |
281 |
|
if (ntp[0] > 1 && sarr[ntp[0]*(ntp[1]+1)] <= |
282 |
|
sarr[(ntp[0]-1)*(ntp[1]+1)]) { |
292 |
|
error(USER, errmsg); |
293 |
|
} |
294 |
|
} |
295 |
< |
nelem = i; |
295 |
> |
/* truncate zero region */ |
296 |
> |
ntp[0] = (last_pos_val + ntp[1])/(ntp[1]+1) - 1; |
297 |
> |
nelem = (ntp[0]+1)*(ntp[1]+1); |
298 |
|
fclose(fp); |
299 |
|
errmsg[0] = '\0'; /* sanity checks */ |
300 |
< |
if (ntp[0] <= 0) |
301 |
< |
sprintf(errmsg, "no data in sensor file '%s'", sfile); |
300 |
> |
if (!last_pos_val) |
301 |
> |
sprintf(errmsg, "no positive sensor values in file '%s'", sfile); |
302 |
|
else if (fabs(sarr[ntp[1]+1]) > FTINY) |
303 |
|
sprintf(errmsg, "minimum theta must be 0 in sensor file '%s'", |
304 |
|
sfile); |
305 |
|
else if (fabs(sarr[1]) > FTINY) |
306 |
|
sprintf(errmsg, "minimum phi must be 0 in sensor file '%s'", |
307 |
|
sfile); |
308 |
< |
else if (sarr[ntp[1]] <= FTINY) |
308 |
> |
else if (sarr[ntp[1]] < 270.-FTINY) |
309 |
|
sprintf(errmsg, |
310 |
< |
"maximum phi must be positive in sensor file '%s'", |
310 |
> |
"maximum phi must be 270 or greater in sensor file '%s'", |
311 |
|
sfile); |
312 |
< |
else if (sarr[ntp[0]*(ntp[1]+1)] <= FTINY) |
312 |
> |
else if (sarr[ntp[1]] >= 360.-FTINY) |
313 |
|
sprintf(errmsg, |
314 |
< |
"maximum theta must be positive in sensor file '%s'", |
314 |
> |
"maximum phi must be less than 360 in sensor file '%s'", |
315 |
|
sfile); |
316 |
|
if (errmsg[0]) |
317 |
|
error(USER, errmsg); |
372 |
|
psize = PI*tsize/maxtheta; |
373 |
|
if (sntp[0]*sntp[1] < samptot) /* don't overdo resolution */ |
374 |
|
samptot = sntp[0]*sntp[1]; |
375 |
< |
ntheta = (int)(sqrt((double)samptot*tsize/psize) + 0.5); |
375 |
> |
ntheta = (int)(sqrt((double)samptot*tsize/psize)*sntp[0]/sntp[1]) + 1; |
376 |
|
if (ntheta > MAXNT) |
377 |
|
ntheta = MAXNT; |
378 |
|
nphi = samptot/ntheta; |
404 |
|
tvals[i] = 1. - ( (1.-frac)*cos(thdiv[t]) + |
405 |
|
frac*cos(thdiv[t+1]) ); |
406 |
|
/* offset b/c sensor values are centered */ |
407 |
< |
if (!t || (t < sntp[0]-1) & (frac >= 0.5)) |
407 |
> |
if ((t < sntp[0]-1) & (!t | (frac >= 0.5))) { |
408 |
|
frac -= 0.5; |
409 |
< |
else { |
409 |
> |
} else { |
410 |
|
frac += 0.5; |
411 |
|
--t; |
412 |
|
} |
430 |
|
} |
431 |
|
pvals[i*(nphi+1) + nphi] = phdiv[sntp[1]]; |
432 |
|
} |
433 |
+ |
/* duplicate final row */ |
434 |
+ |
memcpy(pvals+ntheta*(nphi+1), pvals+(ntheta-1)*(nphi+1), |
435 |
+ |
sizeof(*pvals)*(nphi+1)); |
436 |
|
tvals[0] = .0f; |
437 |
|
tvals[ntheta] = (float)tsize; |
438 |
|
} |