Changeset 38152 for branches/eam_branches/ipp-20150405/ippTools/src/pxspace.c

Timestamp:

Apr 18, 2015, 6:27:41 AM (11 years ago)

Author:

eugene

Message:

merge changes from trunk (updates for pstamp, remote tools, ippToPsps schema 20)

Location:

branches/eam_branches/ipp-20150405

Files:

• . (modified) (1 prop)
• ippTools/src/pxspace.c (modified) (1 diff)

branches/eam_branches/ipp-20150405/ippTools/src/pxspace.c

@@ -59 +59 @@
 bool pxspaceBoxAddWhere(pxConfig *config, psMetadata *where)
 {
-  PXOPT_LOOKUP_F64(ra_min, config->args, "-ra_min", false, false);
-  PXOPT_LOOKUP_F64(ra_max, config->args, "-ra_max", false, false);
-  PXOPT_LOOKUP_F64(dec_min, config->args, "-dec_min", false, false);
-  PXOPT_LOOKUP_F64(dec_max, config->args, "-dec_max", false, false);
+  PXOPT_LOOKUP_F64(ra_min, config->args, "-ra_min", false, NAN);
+  PXOPT_LOOKUP_F64(ra_max, config->args, "-ra_max", false, NAN);
+  PXOPT_LOOKUP_F64(dec_min, config->args, "-dec_min", false, NAN);
+  PXOPT_LOOKUP_F64(dec_max, config->args, "-dec_max", false, NAN);
 
-  if (ra_min) {
+  if (isfinite(ra_min)) {
     ra_min *= PS_RAD_DEG;
     psMetadataAddF32(where,PS_LIST_TAIL,"rawExp.ra",PS_META_DUPLICATE_OK, ">=", ra_min);
   }
-  if (ra_max) {
+  if (isfinite(ra_max)) {
     ra_max *= PS_RAD_DEG;
     psMetadataAddF32(where,PS_LIST_TAIL,"rawExp.ra",PS_META_DUPLICATE_OK, "<=", ra_max);
   }
-  if (dec_min) {
+  if (isfinite(dec_min)) {
     dec_min *= PS_RAD_DEG;
     psMetadataAddF32(where,PS_LIST_TAIL,"rawExp.decl",PS_META_DUPLICATE_OK, ">=", dec_min);
   }
-  if (dec_max) {
+  if (isfinite(dec_max)) {
     dec_max *= PS_RAD_DEG;
     psMetadataAddF32(where,PS_LIST_TAIL,"rawExp.decl",PS_META_DUPLICATE_OK, "<=", dec_max);