Changeset 35189

Timestamp:

Feb 20, 2013, 3:51:00 PM (13 years ago)

Author:

bills

Message:

changes to bgtool

Location:

trunk/ippTools

Files:

• share/bgtool_chip.sql (modified) (2 diffs)
• share/bgtool_warp.sql (modified) (1 diff)
• src/bgtool.c (modified) (1 diff)
• src/bgtoolConfig.c (modified) (1 diff)

trunk/ippTools/share/bgtool_chip.sql

@@ -5 +5 @@
     chipBackgroundRun.label,
     chipBackgroundRun.data_group,
+    chipBackgroundRun.chip_id,
+    chipBackgroundRun.cam_id,
     rawExp.exp_id,
     rawExp.exp_name,
@@ -12 +14 @@
     rawExp.ra,
     rawExp.decl,
-    rawExp.exp_time,
-    chipRun.chip_id
+    rawExp.exp_time
 FROM chipBackgroundRun
 JOIN chipBackgroundImfile USING(chip_bg_id)

trunk/ippTools/share/bgtool_warp.sql

@@ -2 +2 @@
     warpBackgroundSkyfile.*,
     warpBackgroundRun.state,
+    warpBackgroundRun.warp_id,
+    camRun.cam_id,
+    warpBackgroundRun.chip_bg_id,
     warpBackgroundRun.workdir,
     warpBackgroundRun.label,
+    warpRun.label as warp_label,
     rawExp.exp_id,
     rawExp.exp_name,

trunk/ippTools/src/bgtool.c

@@ -1653 +1653 @@
 
     psMetadata *where = psMetadataAlloc();
-    PXOPT_COPY_S64(config->args, where, "-warp_bg_id",    "warpBackgroundRun.warp_bg_id", "==");
-    PXOPT_COPY_STR(config->args, where, "-skycell_id", "warpBackgroundSkyfile.skycell_id", "==");
-    pxAddLabelSearchArgs(config, where, "-label",   "warpBackgroundRun.label", "LIKE");
+    PXOPT_COPY_S64(config->args, where, "-warp_bg_id",   "warpBackgroundRun.warp_bg_id", "==");
+    PXOPT_COPY_S64(config->args, where, "-warp_id",      "warpBackgroundRun.warp_id", "==");
+    PXOPT_COPY_S64(config->args, where, "-chip_bg_id",   "warpBackgroundRun.chip_bg_id", "==");
+    PXOPT_COPY_STR(config->args, where, "-skycell_id",   "warpBackgroundSkyfile.skycell_id", "==");
+    pxAddLabelSearchArgs(config, where, "-label",        "warpBackgroundRun.label", "LIKE");
     pxAddLabelSearchArgs(config, where, "-data_group",   "warpBackgroundRun.data_group", "LIKE");
     pxAddLabelSearchArgs(config, where, "-dist_group",   "warpBackgroundRun.data_group", "LIKE");

trunk/ippTools/src/bgtoolConfig.c

@@ -355 +355 @@
     psMetadata *warpArgs = psMetadataAlloc();
     psMetadataAddS64(warpArgs, PS_LIST_TAIL, "-warp_bg_id", 0, "search by warp_bg_id", 0);
+    psMetadataAddS64(warpArgs, PS_LIST_TAIL, "-warp_id", 0, "search by warp_id", 0);
+    psMetadataAddS64(warpArgs, PS_LIST_TAIL, "-chip_bg_id", 0, "search by chip_bg_id", 0);
     psMetadataAddStr(warpArgs, PS_LIST_TAIL, "-skycell_id", 0, "search by skycell_id", NULL);
     psMetadataAddS16(warpArgs, PS_LIST_TAIL, "-fault",  0, "search by fault code", 0);