Changeset 28428 for trunk/ippTools

Timestamp:

Jun 22, 2010, 10:02:25 PM (16 years ago)

Author:

Paul Price

Message:

Make diffphot respect/propagate magic status. No 'destreaking' set up to run on diffphot yet; we just inherit the magic status of the parent diffRun.

Location:

trunk/ippTools

Files:

• share/diffphottool_advance.sql (modified) (1 diff)
• share/diffphottool_input.sql (modified) (1 diff)
• share/diffphottool_pending.sql (modified) (1 diff)
• share/pubtool_definerun.sql (modified) (1 diff)
• share/pubtool_pending.sql (modified) (1 diff)
• share/pxadmin_create_tables.sql (modified) (1 diff)
• src/diffphottool.c (modified) (2 diffs)
• src/diffphottoolConfig.c (modified) (1 diff)

trunk/ippTools/share/diffphottool_advance.sql

@@ -1 +1 @@
 SELECT
-    diff_phot_id
+    diff_phot_id,
+    magicked
 FROM diffPhotRun
 JOIN diffSkyfile USING(diff_id)

trunk/ippTools/share/diffphottool_input.sql

@@ -2 +2 @@
     diffPhotRun.*,
     diffSkyfile.path_base,
+    diffSkyfile.magicked,
     diffRun.bothways,
     rawExp.camera

trunk/ippTools/share/diffphottool_pending.sql

@@ -9 +9 @@
 WHERE diffPhotSkyfile.skycell_id IS NULL
     AND diffRun.state = 'full'
+    AND diffSkyfile.magicked >= 0
     AND diffSkyfile.fault = 0
     AND diffSkyfile.quality = 0

trunk/ippTools/share/pubtool_definerun.sql

@@ -56 +56 @@
         AND publishClient.active = 1
         AND diffPhotRun.state IN ('full', 'cleaned', 'goto_cleaned')
-        AND (diffRun.diff_mode = 4 OR publishClient.magicked = 0) -- diffPhotRun doesn't respect magic
+        AND (diffPhotRun.magicked != 0 OR diffRun.diff_mode = 4 OR publishClient.magicked = 0)
     -- WHERE hook %s
     ) AS publishToDo

trunk/ippTools/share/pubtool_pending.sql

@@ -74 +74 @@
         AND publishRun.state = 'new'
         AND diffPhotRun.state IN ('full', 'cleaned', 'goto_cleaned')
-        AND (diffRun.diff_mode = 4 OR publishClient.magicked = 0) -- diffPhotRun doesn't respect magic
+        AND (diffPhotRun.magicked != 0 OR diffRun.diff_mode = 4 OR publishClient.magicked = 0)
         -- WHERE hook %s
 ) AS publishToDo

trunk/ippTools/share/pxadmin_create_tables.sql

@@ -1755 +1755 @@
     quality SMALLINT NOT NULL,       -- bad quality flag
     software_ver VARCHAR(16),                       -- software version
+    magicked BIGINT NOT NULL DEFAULT 0, -- magic mask applied
     PRIMARY KEY(diff_phot_id, skycell_id),
     KEY(fault),

trunk/ippTools/src/diffphottool.c

@@ -371 +371 @@
     PXOPT_LOOKUP_STR(ver_ppstats, config->args, "-ver_ppstats", false, false);
     PXOPT_LOOKUP_STR(ver_psphot, config->args, "-ver_psphot", false, false);
+    PXOPT_LOOKUP_S64(magicked, config->args, "-magicked", false, false);
 
     psString version = pxMergeCodeVersions(ver_pslib, ver_psmodules);
@@ -377 +378 @@
 
     if (!diffPhotSkyfileInsert(config->dbh, diff_phot_id, skycell_id, path_base, dtime_script, hostname,
-                               fault, quality, version)) {
+                               fault, quality, version, magicked)) {
         psError(psErrorCodeLast(), false, "database error");
         return false;

trunk/ippTools/src/diffphottoolConfig.c

@@ -100 +100 @@
     psMetadataAddStr(doneArgs, PS_LIST_TAIL, "-ver_ppstats", 0, "define ppStats version", NULL);
     psMetadataAddStr(doneArgs, PS_LIST_TAIL, "-ver_psphot", 0, "define psphot version", NULL);
+    psMetadataAddS64(doneArgs, PS_LIST_TAIL, "-magicked", 0, "define magicked state", 0);
 
     // -advance