ViewVC Help
View File | Revision Log | Show Annotations | Download File | Root Listing
root/radiance/ray/src/util/rsensor.c
(Generate patch)

Comparing ray/src/util/rsensor.c (file contents):
Revision 2.17 by greg, Fri Apr 24 19:17:12 2015 UTC vs.
Revision 2.18 by greg, Tue Jun 9 21:34:15 2015 UTC

# Line 237 | Line 237 | load_sensor(
237                  cp = fskip(cp);
238                  if (cp == NULL)
239                          break;
240 <                if (ntp[1] > 1 && sarr[ntp[1]+1] <= sarr[ntp[1]]) {
240 >                if (ntp[1] > 1 && sarr[ntp[1]+1] <= sarr[ntp[1]]+FTINY) {
241                          sprintf(errmsg,
242                  "Phi values not monotinically increasing in sensor file '%s'",
243                                          sfile);
# Line 303 | Line 303 | load_sensor(
303          else if (fabs(sarr[1]) > FTINY)
304                  sprintf(errmsg, "minimum phi must be 0 in sensor file '%s'",
305                                  sfile);
306 <        else if (sarr[ntp[1]] <= FTINY)
306 >        else if (sarr[ntp[1]] < 270.-FTINY)
307                  sprintf(errmsg,
308 <                        "maximum phi must be positive in sensor file '%s'",
308 >                        "maximum phi must be 270 or greater in sensor file '%s'",
309 >                                sfile);
310 >        else if (sarr[ntp[1]] >= 360.-FTINY)
311 >                sprintf(errmsg,
312 >                        "maximum phi must be less than 360 in sensor file '%s'",
313                                  sfile);
314          if (errmsg[0])
315                  error(USER, errmsg);

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines