Changeset 24951 for branches/czw_branch/cleanup/ippTools/src/disttool.c

Timestamp:

Jul 30, 2009, 5:20:29 PM (17 years ago)

Author:

watersc1

Message:

Finished up my edits to the detrend cleanup, and some changes to my
copy of burntool and the pslib astrometry. Detrend cleanup has not
been tested yet. That's up next.

Location:

branches/czw_branch/cleanup

Files:

• . (modified) (1 prop)
• ippTools/src/disttool.c (modified) (10 diffs)

branches/czw_branch/cleanup/ippTools/src/disttool.c

@@ -189 +189 @@
     PXOPT_COPY_S64(config->args, where, "-exp_id",    "rawExp.exp_id",           "==");
     PXOPT_COPY_S64(config->args, where, "-chip_id",   "chipRun.chip_id",         "==");
-    PXOPT_COPY_STR(config->args, where, "-obs_mode",  "rawExp.obs_mode",         "==");
 
     PXOPT_LOOKUP_STR(label, config->args, "-label", false, false);
@@ -204 +203 @@
             psFree(where);
             return false;
+        }
+
+        // for raw stage we select by chipRun.label because raw labels typically aren't set
+        if (label) {
+            psStringAppend(&query, " AND (chipRun.label = '%s')", label);
         }
     } else if (!strcmp(stage, "chip")) {
@@ -374 +378 @@
         psS64 stage_id = psMetadataLookupS64(NULL, md, "stage_id");
         psS64 target_id = psMetadataLookupS64(NULL, md, "target_id");
+        psString target_label = psMetadataLookupStr(NULL, md, "label");
         bool clean = psMetadataLookupBool(NULL, md, "clean");
 
@@ -379 +384 @@
         psStringAppend(&outroot, "%s/%s/%s", workdir, run_tag, stage); 
 
+        if (set_label == NULL) {
+            set_label = target_label;
+        }
         distRunRow *row = distRunRowAlloc(
                 0,      // dist_id
@@ -857 +865 @@
     psMetadata *where = psMetadataAlloc();
     PXOPT_COPY_S64(config->args, where, "-dist_id", "dist_id", "==");
-    pxAddLabelSearchArgs (config, where, "-label", "label", "==");
+    pxAddLabelSearchArgs (config, where, "-label", "distRun.label", "==");
 
     PXOPT_LOOKUP_U64(limit, config->args, "-limit", false, false);
@@ -1265 +1273 @@
 
     // required
-    PXOPT_LOOKUP_STR(obs_mode, config->args, "-obs_mode", true, false);
+    PXOPT_LOOKUP_STR(label, config->args, "-label", true, false);
+    PXOPT_LOOKUP_STR(filter, config->args, "-filter", true, false);
     PXOPT_LOOKUP_STR(stage, config->args, "-stage", true, false);
 
@@ -1275 +1284 @@
     distTargetRow *row = distTargetRowAlloc(
             0,          // target_id
-            obs_mode,
+            label,
+            filter,
             stage,
             clean,
@@ -1311 +1321 @@
     psMetadata *where = psMetadataAlloc();
     PXOPT_COPY_S64(config->args, where, "-target_id", "target_id", "==");
-    PXOPT_COPY_STR(config->args, where, "-obs_mode", "obs_mode", "==");
+    PXOPT_COPY_STR(config->args, where, "-label", "label", "==");
+    PXOPT_COPY_STR(config->args, where, "-filter", "filter", "==");
     PXOPT_COPY_STR(config->args, where, "-stage", "stage", "==");
 
@@ -1346 +1357 @@
     psMetadata *where = psMetadataAlloc();
     PXOPT_COPY_S64(config->args, where, "-target_id", "target_id", "==");
-    PXOPT_COPY_STR(config->args, where, "-obs_mode", "obs_mode", "==");
+    PXOPT_COPY_STR(config->args, where, "-label", "label", "==");
+    PXOPT_COPY_STR(config->args, where, "-filter", "filter", "==");
     PXOPT_COPY_STR(config->args, where, "-stage", "stage", "==");
     PXOPT_COPY_STR(config->args, where, "-state", "state", "==");
@@ -1368 +1380 @@
         psFree(whereClause);
         if (clean) {
-            psStringAppend(&query, " (AND clean)");
+            psStringAppend(&query, " AND (clean)");
         } else if (full) {
-            psStringAppend(&query, " (AND !clean)");
+            psStringAppend(&query, " AND (!clean)");
         }
     } else if (clean) {