Changeset 37900 for trunk/ippTools

Timestamp:

Feb 5, 2015, 4:21:46 PM (11 years ago)

Author:

watersc1

Message:

Add pxspaceBox command to append {ra|dec}_{min|max} limits to queries, and added such to difftool/definewarpstack.

Location:

trunk/ippTools/src

Files:

• difftool.c (modified) (2 diffs)
• difftoolConfig.c (modified) (1 diff)
• pxspace.c (modified) (1 diff)
• pxspace.h (modified) (1 diff)

trunk/ippTools/src/difftool.c

@@ -1244 +1244 @@
   PXOPT_COPY_STR(config->args, where, "-stack_data_group", "stackRun.data_group", "==");
 
+  // Add position dependence here.
+  if (!pxspaceBoxAddWhere(config,where)) {
+    psError(psErrorCodeLast(), false, "pxSpaceBoxAddWhere failed");
+    return false;
+  }
+  
+  
   PXOPT_LOOKUP_BOOL(bothways, config->args, "-bothways", false);
   
@@ -1530 +1537 @@
     PXOPT_COPY_STR(config->args, expWhere, "-filter", "filter", "==");
     PXOPT_COPY_STR(config->args, expWhere, "-comment", "comment", "LIKE");
+    
     PXOPT_COPY_S64(config->args, warp1Where, "-warp_id", "warpRun.warp_id", "==");
     PXOPT_COPY_STR(config->args, warp1Where, "-warp_label", "warpRun.label", "==");

trunk/ippTools/src/difftoolConfig.c

@@ -272 +272 @@
     psMetadataAddBool(definewarpstackArgs, PS_LIST_TAIL, "-pretend", 0, "list results but to not queue", false);
 
+    pxspaceBoxAddArguments(definewarpstackArgs);
+
+    
     // -definewarpwarp
     psMetadata *definewarpwarpArgs = psMetadataAlloc();

trunk/ippTools/src/pxspace.c

@@ -57 +57 @@
 }
 
+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);
+
+  if (ra_min) {
+    ra_min *= PS_RAD_DEG;
+    psMetadataAddF32(where,PS_LIST_TAIL,"rawExp.ra",PS_META_DUPLICATE_OK, ">=", ra_min);
+  }
+  if (ra_max) {
+    ra_max *= PS_RAD_DEG;
+    psMetadataAddF32(where,PS_LIST_TAIL,"rawExp.ra",PS_META_DUPLICATE_OK, "<=", ra_max);
+  }
+  if (dec_min) {
+    dec_min *= PS_RAD_DEG;
+    psMetadataAddF32(where,PS_LIST_TAIL,"rawExp.decl",PS_META_DUPLICATE_OK, ">=", dec_min);
+  }
+  if (dec_max) {
+    dec_max *= PS_RAD_DEG;
+    psMetadataAddF32(where,PS_LIST_TAIL,"rawExp.decl",PS_META_DUPLICATE_OK, "<=", dec_max);
+  }
+    
+  return true;
+}
+
+void pxspaceBoxAddArguments(psMetadata *md)
+{
+    psMetadataAddF64(md,  PS_LIST_TAIL, "-ra_min",            0, "search by right ascension (degrees)", NAN);
+    psMetadataAddF64(md,  PS_LIST_TAIL, "-dec_min",           0, "search by declination (degrees)", NAN);
+    psMetadataAddF64(md,  PS_LIST_TAIL, "-ra_max",            0, "search by right ascension (degrees)", NAN);
+    psMetadataAddF64(md,  PS_LIST_TAIL, "-dec_max",           0, "search by declination (degrees)", NAN);
+}
+  
+
 void pxskycellAddArguments(psMetadata *md)
 {

trunk/ippTools/src/pxspace.h

@@ -24 +24 @@
 extern void pxspaceAddArguments(psMetadata *md);
 
+extern bool pxspaceBoxAddWhere(pxConfig *config, psMetadata *where);
+extern void pxspaceBoxAddArguments(psMetadata *md);
+
 extern bool pxskycellAddWhere(pxConfig *config, psMetadata *where);
 extern void pxskycellAddArguments(psMetadata *md);