--- ray/src/util/rsensor.c 2015/04/24 19:17:12 2.17 +++ ray/src/util/rsensor.c 2020/07/24 17:09:33 2.20 @@ -1,5 +1,5 @@ #ifndef lint -static const char RCSid[] = "$Id: rsensor.c,v 2.17 2015/04/24 19:17:12 greg Exp $"; +static const char RCSid[] = "$Id: rsensor.c,v 2.20 2020/07/24 17:09:33 greg Exp $"; #endif /* @@ -9,6 +9,7 @@ static const char RCSid[] = "$Id: rsensor.c,v 2.17 201 */ #include "ray.h" +#include "platform.h" #include "source.h" #include "view.h" #include "random.h" @@ -77,7 +78,9 @@ quit(ec) /* make sure exit is called */ int ec; { if (ray_pnprocs > 0) /* close children if any */ - ray_pclose(0); + ray_pclose(0); + else if (ray_pnprocs < 0) + _exit(ec); /* avoid flush in child */ exit(ec); } @@ -237,7 +240,7 @@ load_sensor( cp = fskip(cp); if (cp == NULL) break; - if (ntp[1] > 1 && sarr[ntp[1]+1] <= sarr[ntp[1]]) { + if (ntp[1] > 1 && sarr[ntp[1]+1] <= sarr[ntp[1]]+FTINY) { sprintf(errmsg, "Phi values not monotinically increasing in sensor file '%s'", sfile); @@ -303,9 +306,13 @@ load_sensor( else if (fabs(sarr[1]) > FTINY) sprintf(errmsg, "minimum phi must be 0 in sensor file '%s'", sfile); - else if (sarr[ntp[1]] <= FTINY) + else if (sarr[ntp[1]] < 270.-FTINY) sprintf(errmsg, - "maximum phi must be positive in sensor file '%s'", + "maximum phi must be 270 or greater in sensor file '%s'", + sfile); + else if (sarr[ntp[1]] >= 360.-FTINY) + sprintf(errmsg, + "maximum phi must be less than 360 in sensor file '%s'", sfile); if (errmsg[0]) error(USER, errmsg);