Changeset 35134 for trunk/ippTools

Timestamp:

Feb 8, 2013, 11:50:49 AM (13 years ago)

Author:

bills

Message:

For warp_bg stage add column alt_cam_label. If set use the smf file
from that cam run for the astrometry. This is intended to be a
camRun with the nomal backckground subtraction.

Location:

trunk/ippTools

Files:

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

trunk/ippTools/share/bgtool_towarp.sql

@@ -24 +24 @@
     AND (Label.active OR Label.active IS NULL)
 -- WHERE hook %s
-ORDER BY priority DESC, chip_bg_id
+ORDER BY priority DESC, warp_bg_id, skycell_id

trunk/ippTools/share/bgtool_warp.sql

@@ -4 +4 @@
     warpBackgroundRun.workdir,
     warpBackgroundRun.label,
+    warpBackgroundRun.alt_cam_label,
     rawExp.exp_id,
     rawExp.exp_name,

trunk/ippTools/share/pxadmin_create_tables.sql

@@ -1843 +1843 @@
     data_group VARCHAR(64),           -- group for data
     dist_group VARCHAR(64),           -- group for distribution
-    reduction VARCHAR(64),    -- reduction class (for altering recipe)
+    reduction VARCHAR(64),            -- reduction class (for altering recipe)
+    alt_cam_label VARCHAR(64),        -- label for alternate version of astrometry (optional)
     note VARCHAR(255),        -- note
     registered TIMESTAMP DEFAULT CURRENT_TIMESTAMP, -- time run was registered

trunk/ippTools/src/bgtool.c

@@ -1310 +1310 @@
     PXOPT_LOOKUP_STR(dist_group, config->args, "-set_dist_group", false, false);
     PXOPT_LOOKUP_STR(reduction, config->args, "-set_reduction", false, false);
+    PXOPT_LOOKUP_STR(alt_cam_label, config->args, "-set_alt_cam_label", false, false);
     PXOPT_LOOKUP_STR(note, config->args, "-set_note", false, false);
     PXOPT_LOOKUP_TIME(registered, config->args, "-registered", false, false);
@@ -1424 +1425 @@
                                      dist_group  ? dist_group : row->dist_group,
                                      reduction   ? reduction  : row->reduction,
+                                     alt_cam_label,
                                      note        ? note       : row->note,
                                      NULL, 0)) {

trunk/ippTools/src/bgtoolConfig.c

@@ -285 +285 @@
     psMetadataAddStr(definewarpArgs, PS_LIST_TAIL, "-set_label", 0, "define label", NULL);
     psMetadataAddStr(definewarpArgs, PS_LIST_TAIL, "-set_reduction", 0, "define reduction class", NULL);
+    psMetadataAddStr(definewarpArgs, PS_LIST_TAIL, "-set_alt_cam_label", 0, "define alternate astrometry sources", NULL);
     psMetadataAddStr(definewarpArgs, PS_LIST_TAIL, "-set_data_group", 0, "define data group", NULL);
     psMetadataAddStr(definewarpArgs, PS_LIST_TAIL, "-set_dist_group", 0, "define dist group", NULL);