Changeset 36680 for branches/eam_branches/ps2-tc3-20130727/ippTools/share

Timestamp:

Apr 21, 2014, 5:42:34 AM (12 years ago)

Author:

eugene

Message:

merge changes from trunk

Location:

branches/eam_branches/ps2-tc3-20130727

Files:

• . (modified) (1 prop)
• ippTools/share (modified) (1 prop)
• ippTools/share/Makefile.am (modified) (6 diffs)
• ippTools/share/camtool_find_pendingimfile.sql (modified) (1 prop)
• ippTools/share/camtool_pendingexp.sql (modified) (1 diff)
• ippTools/share/chiptool_pendingcleanuprun.sql (modified) (1 diff)
• ippTools/share/chiptool_setimfiletoupdate.sql (modified) (1 prop)
• ippTools/share/detselect_show.sql (copied) (copied from trunk/ippTools/share/detselect_show.sql )
• ippTools/share/disttool_definebyquery_SSdiff.sql (modified) (1 diff)
• ippTools/share/disttool_definebyquery_camera.sql (modified) (1 diff)
• ippTools/share/disttool_definebyquery_chip.sql (modified) (1 diff)
• ippTools/share/disttool_definebyquery_chip_bg.sql (modified) (1 diff)
• ippTools/share/disttool_definebyquery_diff.sql (modified) (1 diff)
• ippTools/share/disttool_definebyquery_fake.sql (modified) (1 diff)
• ippTools/share/disttool_definebyquery_ff.sql (copied) (copied from trunk/ippTools/share/disttool_definebyquery_ff.sql )
• ippTools/share/disttool_definebyquery_raw.sql (modified) (1 diff)
• ippTools/share/disttool_definebyquery_sky.sql (modified) (2 diffs)
• ippTools/share/disttool_definebyquery_sky_singlefilter.sql (modified) (1 diff)
• ippTools/share/disttool_definebyquery_skycal.sql (copied) (copied from trunk/ippTools/share/disttool_definebyquery_skycal.sql )
• ippTools/share/disttool_definebyquery_stack.sql (modified) (1 diff)
• ippTools/share/disttool_definebyquery_warp.sql (modified) (1 diff)
• ippTools/share/disttool_definebyquery_warp_bg.sql (modified) (1 diff)
• ippTools/share/disttool_pending_ff.sql (copied) (copied from trunk/ippTools/share/disttool_pending_ff.sql )
• ippTools/share/disttool_pending_skycal.sql (copied) (copied from trunk/ippTools/share/disttool_pending_skycal.sql )
• ippTools/share/disttool_toadvance.sql (modified) (2 diffs)
• ippTools/share/fftool_definebyquery.sql (copied) (copied from trunk/ippTools/share/fftool_definebyquery.sql )
• ippTools/share/fftool_definebyquery_select_warps.sql (copied) (copied from trunk/ippTools/share/fftool_definebyquery_select_warps.sql )
• ippTools/share/fftool_export_input.sql (copied) (copied from trunk/ippTools/share/fftool_export_input.sql )
• ippTools/share/fftool_export_result.sql (copied) (copied from trunk/ippTools/share/fftool_export_result.sql )
• ippTools/share/fftool_export_run.sql (copied) (copied from trunk/ippTools/share/fftool_export_run.sql )
• ippTools/share/fftool_export_summary.sql (copied) (copied from trunk/ippTools/share/fftool_export_summary.sql )
• ippTools/share/fftool_result.sql (copied) (copied from trunk/ippTools/share/fftool_result.sql )
• ippTools/share/fftool_revert.sql (copied) (copied from trunk/ippTools/share/fftool_revert.sql )
• ippTools/share/fftool_revertsummary.sql (copied) (copied from trunk/ippTools/share/fftool_revertsummary.sql )
• ippTools/share/fftool_summary.sql (copied) (copied from trunk/ippTools/share/fftool_summary.sql )
• ippTools/share/fftool_summaryinputs.sql (copied) (copied from trunk/ippTools/share/fftool_summaryinputs.sql )
• ippTools/share/fftool_toadvance.sql (copied) (copied from trunk/ippTools/share/fftool_toadvance.sql )
• ippTools/share/fftool_todo.sql (copied) (copied from trunk/ippTools/share/fftool_todo.sql )
• ippTools/share/pstamptool_pendingdependent.sql (modified) (1 diff)
• ippTools/share/pxadmin_create_tables.sql (modified) (3 diffs, 1 prop)
• ippTools/share/pxadmin_drop_tables.sql (modified) (1 diff)
• ippTools/share/releasetool_listrelexp.sql (modified) (2 diffs)
• ippTools/share/releasetool_listrelstack.sql (modified) (2 diffs)
• ippTools/share/releasetool_stacksummary.sql (copied) (copied from trunk/ippTools/share/releasetool_stacksummary.sql )
• ippTools/share/releasetool_summary.sql (copied) (copied from trunk/ippTools/share/releasetool_summary.sql )
• ippTools/share/remotetool_definebyquery_cam.sql (copied) (copied from trunk/ippTools/share/remotetool_definebyquery_cam.sql )
• ippTools/share/remotetool_definebyquery_chip.sql (copied) (copied from trunk/ippTools/share/remotetool_definebyquery_chip.sql )
• ippTools/share/remotetool_definebyquery_stack.sql (copied) (copied from trunk/ippTools/share/remotetool_definebyquery_stack.sql )
• ippTools/share/remotetool_definebyquery_warp.sql (copied) (copied from trunk/ippTools/share/remotetool_definebyquery_warp.sql )
• ippTools/share/remotetool_updatepoll.sql (copied) (copied from trunk/ippTools/share/remotetool_updatepoll.sql )
• ippTools/share/stacktool_addsummary.sql (modified) (1 diff)
• ippTools/share/stacktool_revertsummary.sql (copied) (copied from trunk/ippTools/share/stacktool_revertsummary.sql )
• ippTools/share/stacktool_summary.sql (copied) (copied from trunk/ippTools/share/stacktool_summary.sql )
• ippTools/share/staticskytool_export_skycalresult.sql (copied) (copied from trunk/ippTools/share/staticskytool_export_skycalresult.sql )
• ippTools/share/staticskytool_export_skycalrun.sql (copied) (copied from trunk/ippTools/share/staticskytool_export_skycalrun.sql )
• ippTools/share/staticskytool_skycalresult.sql (modified) (1 diff)
• ippTools/share/warptool_scmap.sql (modified) (1 diff)
• ippTools/share/warptool_towarped.sql (modified) (1 prop)
• ippTools/share/warptool_warped.sql (modified) (2 diffs)

branches/eam_branches/ps2-tc3-20130727/ippTools/share/Makefile.am

@@ -105 +105 @@
         detselect_search.sql \
         detselect_select.sql \
+        detselect_show.sql \
         dettool_addprocessedexp.sql \
         dettool_childlessrun.sql \
@@ -189 +190 @@
         disttool_definebyquery_diff.sql \
         disttool_definebyquery_fake.sql \
+        disttool_definebyquery_ff.sql \
         disttool_definebyquery_raw.sql \
         disttool_definebyquery_raw_no_magic.sql \
         disttool_definebyquery_sky.sql \
         disttool_definebyquery_sky_singlefilter.sql \
+        disttool_definebyquery_skycal.sql \
         disttool_definebyquery_stack.sql \
         disttool_definebyquery_warp.sql \
@@ -205 +208 @@
         disttool_pending_diff.sql \
         disttool_pending_fake.sql \
+        disttool_pending_ff.sql \
         disttool_pending_raw.sql \
         disttool_pending_sky.sql \
+        disttool_pending_skycal.sql \
         disttool_pending_stack.sql \
         disttool_pending_warp.sql \
@@ -398 +403 @@
         stacktool_tosummary.sql \
         stacktool_addsummary.sql \
+        stacktool_revertsummary.sql \
+        stacktool_summary.sql \
         staticskytool_definebyquery_select.sql \
         staticskytool_definebyquery_select_by_dg.sql \
@@ -408 +415 @@
         staticskytool_export_input.sql \
         staticskytool_export_result.sql \
+        staticskytool_export_skycalrun.sql \
+        staticskytool_export_skycalresult.sql \
         staticskytool_inputs.sql \
         staticskytool_todo.sql \
@@ -476 +485 @@
         releasetool_definerelstack_with_skycal.sql \
         releasetool_listrelstack.sql \
+        releasetool_summary.sql \
         releasetool_definerelgroup_select_lap.sql \
         releasetool_definerelgroup_select_data_group.sql \
         releasetool_definerelgroup_select_exp_data_group.sql \
         releasetool_definerelgroup_select_exp_lap.sql \
-        releasetool_pendingrelgroup.sql
-
+        releasetool_stacksummary.sql \
+        releasetool_pendingrelgroup.sql \
+        fftool_definebyquery.sql \
+        fftool_definebyquery_select_warps.sql \
+        fftool_result.sql \
+        fftool_revert.sql \
+        fftool_revertsummary.sql \
+        fftool_summary.sql \
+        fftool_todo.sql \
+        fftool_toadvance.sql \
+        fftool_export_run.sql \
+        fftool_export_input.sql \
+        fftool_export_result.sql \
+        fftool_export_summary.sql \
+        remotetool_definebyquery_chip.sql \
+        remotetool_definebyquery_cam.sql \
+        remotetool_definebyquery_warp.sql \
+        remotetool_definebyquery_stack.sql \
+        remotetool_updatepoll.sql

branches/eam_branches/ps2-tc3-20130727/ippTools/share/camtool_pendingexp.sql

@@ -23 +23 @@
 WHERE
     chipRun.state = 'full'
-    AND ((camRun.state = 'new' AND camProcessedExp.cam_id IS NULL) OR camRun.state = 'update')
+    AND ((camRun.state = 'new' AND camProcessedExp.cam_id IS NULL) OR
+         (camRun.state = 'update' and camProcessedExp.fault = 0 and camProcessedExp.quality = 0))
     AND camMask.label IS NULL
     AND (Label.active OR Label.active IS NULL)

branches/eam_branches/ps2-tc3-20130727/ippTools/share/chiptool_pendingcleanuprun.sql

@@ -4 +4 @@
     rawExp.exp_tag,
     chipRun.state,
-    chipRun.workdir
+    chipRun.workdir,
+    chipRun.label,
+    IFNULL(Label.priority, 10000) AS priority
 FROM chipRun
 JOIN rawExp 
 USING (exp_id)
+LEFT JOIN Label ON chipRun.label = Label.label
 WHERE
     (chipRun.state = 'goto_cleaned' OR chipRun.state = 'goto_scrubbed' OR chipRun.state = 'goto_purged')

branches/eam_branches/ps2-tc3-20130727/ippTools/share/disttool_definebyquery_SSdiff.sql

@@ -22 +22 @@
       AND distTarget.state = 'enabled'
       AND rcInterest.state = 'enabled'
-      AND distRun.dist_id IS NULL
-
       AND ((diffRun.state = 'full') OR (distTarget.clean AND diffRun.state = 'cleaned'))

branches/eam_branches/ps2-tc3-20130727/ippTools/share/disttool_definebyquery_camera.sql

@@ -21 +21 @@
 WHERE distTarget.state = 'enabled'
     AND rcInterest.state = 'enabled'
-    AND distRun.dist_id IS NULL      -- no existing distRun 
     AND ((camRun.state = 'full') OR (distTarget.clean AND camRun.state = 'cleaned'))

branches/eam_branches/ps2-tc3-20130727/ippTools/share/disttool_definebyquery_chip.sql

@@ -20 +20 @@
 WHERE distTarget.state = 'enabled'
     AND rcInterest.state = 'enabled'
-    AND distRun.dist_id IS NULL      -- no existing distRun 
     AND ((chipRun.state = 'full') OR (distTarget.clean AND chipRun.state = 'cleaned'))

branches/eam_branches/ps2-tc3-20130727/ippTools/share/disttool_definebyquery_chip_bg.sql

@@ -23 +23 @@
 WHERE distTarget.state = 'enabled'
     AND rcInterest.state = 'enabled'
-    AND distRun.dist_id IS NULL      -- no existing distRun
     AND ((chipBackgroundRun.state = 'full') OR (distTarget.clean AND chipBackgroundRun.state = 'cleaned'))

branches/eam_branches/ps2-tc3-20130727/ippTools/share/disttool_definebyquery_diff.sql

@@ -25 +25 @@
 WHERE  distTarget.state = 'enabled'
     AND rcInterest.state = 'enabled'
-    AND distRun.dist_id IS NULL
     AND ((diffRun.state = 'full') OR (distTarget.clean AND diffRun.state = 'cleaned'))
 

branches/eam_branches/ps2-tc3-20130727/ippTools/share/disttool_definebyquery_fake.sql

@@ -20 +20 @@
 WHERE  distTarget.state = 'enabled'
     AND rcInterest.state = 'enabled'
-    AND distRun.dist_id IS NULL
     AND ((fakeRun.state = 'full') OR (distTarget.clean AND fakeRun.state = 'cleaned'))

branches/eam_branches/ps2-tc3-20130727/ippTools/share/disttool_definebyquery_raw.sql

@@ -16 +16 @@
 JOIN rcInterest USING(target_id)
 LEFT JOIN distRun ON distRun.stage_id = exp_id AND distRun.target_id = distTarget.target_id
-WHERE distRun.dist_id IS NULL           -- no existing distRun for this exposure
-    AND distTarget.state = 'enabled'    -- target and intrest are enabled
+WHERE distTarget.state = 'enabled'    -- target and intrest are enabled
     AND rcInterest.state = 'enabled'
     AND magicDSRun.state = 'full'       -- destreaked files are available

branches/eam_branches/ps2-tc3-20130727/ippTools/share/disttool_definebyquery_sky.sql

@@ -3 +3 @@
     staticskyRun.sky_id AS stage_id,
     CAST(0 AS SIGNED) AS magicked,
-    -- run tag in the form 'sky.$skycell_id.$stack_id'
+    -- run tag in the form 'sky.$skycell_id.$sky_id'
     CONCAT_WS('.', 'sky', stackRun.skycell_id, convert(staticskyRun.sky_id, CHAR)) as run_tag,
     staticskyRun.label,
@@ -23 +23 @@
     AND rcInterest.state = 'enabled'
     AND distTarget.filter = 'multi'
-    AND distRun.dist_id IS NULL
     AND ((staticskyRun.state = 'full') OR (distTarget.clean AND staticskyRun.state = 'cleaned'))
     -- we shouldn't need to check fault. If faulted it shouldn't be full

branches/eam_branches/ps2-tc3-20130727/ippTools/share/disttool_definebyquery_sky_singlefilter.sql

@@ -22 +22 @@
 WHERE  distTarget.state = 'enabled'
     AND rcInterest.state = 'enabled'
-    AND distRun.dist_id IS NULL
     AND ((staticskyRun.state = 'full') OR (distTarget.clean AND staticskyRun.state = 'cleaned'))
     AND stackRun.filter = distTarget.filter

branches/eam_branches/ps2-tc3-20130727/ippTools/share/disttool_definebyquery_stack.sql

@@ -21 +21 @@
 WHERE  distTarget.state = 'enabled'
     AND rcInterest.state = 'enabled'
-    AND distRun.dist_id IS NULL
     AND ((stackRun.state = 'full') OR (distTarget.clean AND stackRun.state = 'cleaned'))
     -- we shouldn't need to check fault. If faulted it shouldn't be full

branches/eam_branches/ps2-tc3-20130727/ippTools/share/disttool_definebyquery_warp.sql

@@ -22 +22 @@
 WHERE  distTarget.state = 'enabled'
     AND rcInterest.state = 'enabled'
-    AND distRun.dist_id IS NULL
     AND ((warpRun.state = 'full') OR (distTarget.clean AND warpRun.state = 'cleaned'))
 

branches/eam_branches/ps2-tc3-20130727/ippTools/share/disttool_definebyquery_warp_bg.sql

@@ -24 +24 @@
 WHERE  distTarget.state = 'enabled'
     AND rcInterest.state = 'enabled'
-    AND distRun.dist_id IS NULL
     AND ((warpBackgroundRun.state = 'full') OR (distTarget.clean AND warpBackgroundRun.state = 'cleaned'))
 

branches/eam_branches/ps2-tc3-20130727/ippTools/share/disttool_toadvance.sql

@@ -262 +262 @@
         AND distComponent.fault = 0
 UNION
+-- skycal stage
+-- NOTE this assumes that there is only one component per skycalRun
+-- (one skycell)
+SELECT
+    distRun.dist_id,
+    stage,
+    stage_id,
+    outroot,
+    label,
+    clean
+    FROM distRun
+    JOIN skycalResult on stage_id = skycal_id
+    LEFT JOIN distComponent
+        ON distRun.dist_id = distComponent.dist_id
+    WHERE
+        distRun.state = 'new'
+        AND distRun.fault = 0
+        AND distRun.stage = 'skycal'
+        AND distComponent.component IS NOT NULL
+        AND distComponent.fault = 0
+UNION
 -- SSdiff stage
 SELECT
@@ -287 +308 @@
         COUNT(diffSkyfile.skycell_id) = COUNT(distComponent.component)
         AND SUM(distComponent.fault) = 0
+UNION
+-- ff stage
+SELECT
+    distRun.dist_id,
+    stage,
+    stage_id,
+    outroot,
+    distRun.label,
+    clean
+    -- ,COUNT(warp_id)
+    -- ,COUNT(ff_id)
+    FROM distRun
+    JOIN fullForceRun ON stage_id = ff_id
+    JOIN fullForceResult USING(ff_id)
+    JOIN skycalRun USING(skycal_id)
+    JOIN stackRun USING(stack_id)
+    LEFT JOIN distComponent
+        ON distRun.dist_id = distComponent.dist_id
+        AND distComponent.component = CONCAT_WS('.', warp_id, stackRun.skycell_id) 
+    WHERE
+        distRun.state = 'new'
+        AND distRun.fault = 0
+        AND distRun.stage = 'ff'
+    GROUP BY
+        distRun.dist_id,
+        ff_id
+    HAVING
+        -- number of dist components is the number of warps plus 1 (for the summary component)
+        COUNT(fullForceResult.ff_id) = COUNT(distComponent.component)
+        AND SUM(distComponent.fault) = 0
 ) as Foo

branches/eam_branches/ps2-tc3-20130727/ippTools/share/pstamptool_pendingdependent.sql

@@ -1 +1 @@
 SELECT DISTINCT
     pstampDependent.*,
+    pstampRequest.label,
     concat( pstampDependent.outdir, '/checkdep.', dep_id, '.log') as logfile,
     IFNULL(Label.priority, 10000) AS priority

branches/eam_branches/ps2-tc3-20130727/ippTools/share/pxadmin_create_tables.sql

@@ -2172 +2172 @@
     dataRelease INT,         -- PSPS dataRelease
     priority    INT,
+    dvodb       VARCHAR(255),
+    ubercal_file VARCHAR(255),
     PRIMARY KEY(rel_id),
     UNIQUE KEY(surveyID, release_name),
@@ -2186 +2188 @@
     chip_id     BIGINT,         -- links to the runs that supplied the data
     cam_id      BIGINT,         -- for this release
-    group_id    INT,         -- id of relGroup that this exposure is contained in
+    group_id    INT,            -- id of relGroup that this exposure is contained in
     state       VARCHAR(16),    -- released, pending, archive, drop  
-    flags       INT UNSIGNED,  -- flags for relphot, relastro, ??
+    flags       INT UNSIGNED,   -- flags for relphot, relastro, ??
     zpt_obs     FLOAT,          -- calibrated zero point for this release of
     zpt_stdev   FLOAT,          -- this exposure
+    mcal        FLOAT,          -- this exposure
+    ubercal_dist INT,           -- ubercal distance (from dvo calibration)
     path_base   VARCHAR(255),   -- path_base of any supporting files for this
                                 -- release of this exposure.
@@ -2303 +2307 @@
 ) ENGINE=InnoDB DEFAULT CHARSET=latin1;
 
+CREATE TABLE fullForceRun (
+    ff_id           BIGINT NOT NULL AUTO_INCREMENT,
+    skycal_id       BIGINT,
+    sources_path_base VARCHAR(255),
+    state           VARCHAR(64),
+    workdir         VARCHAR(255),
+    label           VARCHAR(64),
+    data_group      VARCHAR(64),
+    dist_group      VARCHAR(64),
+    note            VARCHAR(255),
+    reduction       VARCHAR(64),
+    registered TIMESTAMP DEFAULT CURRENT_TIMESTAMP, -- time run was registered
+    PRIMARY KEY(ff_id),
+    KEY(state),
+    KEY(label),
+    KEY(data_group),
+    KEY(skycal_id),
+    FOREIGN KEY(skycal_id) REFERENCES skycalRun(skycal_id)
+) ENGINE=innodb DEFAULT CHARSET=latin1;
+
+CREATE TABLE fullForceInput (
+    ff_id           BIGINT,
+    warp_id         BIGINT,
+    PRIMARY KEY(ff_id, warp_id),
+    FOREIGN KEY(ff_id) REFERENCES fullForceRun(ff_id),
+    FOREIGN KEY(warp_id) REFERENCES warpRun(warp_id)
+) ENGINE=innodb DEFAULT CHARSET=latin1;
+
+CREATE TABLE fullForceResult (
+    ff_id           BIGINT,
+    warp_id         BIGINT,
+    path_base       VARCHAR(255) NOT NULL,
+    dtime_script    FLOAT,
+    quality         SMALLINT NOT NULL,
+    hostname        VARCHAR(64) NOT NULL,
+    software_ver    VARCHAR(16),
+    fault           SMALLINT NOT NULL,
+    PRIMARY KEY(ff_id, warp_id),
+    KEY(fault),
+    KEY(quality),
+    FOREIGN KEY(ff_id) REFERENCES fullForceRun(ff_id),
+    FOREIGN KEY(warp_id) REFERENCES warpRun(warp_id)
+) ENGINE=innodb DEFAULT CHARSET=latin1;
+
+CREATE TABLE fullForceSummary (
+    ff_id           BIGINT,
+    path_base       VARCHAR(255) NOT NULL,
+    dtime_script    FLOAT,
+    quality         SMALLINT NOT NULL,
+    hostname        VARCHAR(64) NOT NULL,
+    software_ver    VARCHAR(16),
+    fault           SMALLINT NOT NULL,
+    PRIMARY KEY(ff_id),
+    KEY(fault),
+    KEY(quality),
+    FOREIGN KEY(ff_id) REFERENCES fullForceRun(ff_id)
+) ENGINE=innodb DEFAULT CHARSET=latin1;
+
+CREATE TABLE remoteRun (
+    remote_id BIGINT NOT NULL AUTO_INCREMENT,
+    state     VARCHAR(64) NOT NULL,
+    stage     VARCHAR(64) NOT NULL,
+    label     VARCHAR(64) NOT NULL,
+    path_base VARCHAR(255) NOT NULL,
+    job_id    BIGINT,
+    last_poll TIMESTAMP NOT NULL DEFAULT CURRENT_TIMESTAMP ON UPDATE CURRENT_TIMESTAMP,
+    fault     SMALLINT NOT NULL,
+    PRIMARY KEY (remote_id),
+    KEY (state),
+    KEY (stage),
+    KEY (label),
+    KEY (job_id)
+) ENGINE=innodb DEFAULT CHARSET=latin1;
+
+CREATE TABLE remoteComponent (
+    remote_id BIGINT,
+    stage_id  BIGINT,
+    KEY (stage_id),
+    FOREIGN KEY (remote_id) REFERENCES remoteRun(remote_id)
+) ENGINE=innodb DEFAULT CHARSET=latin1;
+
 -- These comment lines are here to avoid an empty query error.
 -- Another way to avoid that problem is to omit the semicolon above but I think that is untidy.

branches/eam_branches/ps2-tc3-20130727/ippTools/share/pxadmin_drop_tables.sql

@@ -118 +118 @@
 DROP TABLE IF EXISTS mergedvodbProcessed;
 DROP TABLE IF EXISTS mergedvodbRun;
+DROP TABLE IF EXISTS dqstatsContent;
 DROP TABLE IF EXISTS dqstatsRun;
-DROP TABLE IF EXISTS dqstatsContent;
+DROP TABLE IF EXISTS fullForceRun;
+DROP TABLE IF EXISTS fullForceInput;
+DROP TABLE IF EXISTS fullForceResult;
+DROP TABLE IF EXISTS fullForceSummary;
+
 
 SET FOREIGN_KEY_CHECKS=1

branches/eam_branches/ps2-tc3-20130727/ippTools/share/releasetool_listrelexp.sql

@@ -7 +7 @@
     ippRelease.rel_id,
     ippRelease.priority,
+    ippRelease.dvodb,
+    ippRelease.ubercal_file,
     survey.surveyName,
     rawExp.exp_name,
@@ -12 +14 @@
     relExp.zpt_obs,
     relExp.zpt_stdev,
+    relExp.mcal,
+    relExp.ubercal_dist,
     relExp.path_base,
     relExp.registered,

branches/eam_branches/ps2-tc3-20130727/ippTools/share/releasetool_listrelstack.sql

@@ -10 +10 @@
     skycalResult.path_base AS skycal_path_base,
     skycalRun.data_group AS skycal_data_group,
+    staticskyResult.sky_id AS sky_id,
+    staticskyResult.path_base AS staticsky_path_base,
     'GPC1' AS camera
 FROM relStack
@@ -18 +20 @@
 LEFT JOIN skycalRun USING(skycal_id)
 LEFT JOIN skycalResult USING(skycal_id)
+LEFT JOIN staticskyResult USING(sky_id)

branches/eam_branches/ps2-tc3-20130727/ippTools/share/stacktool_addsummary.sql

@@ -1 +1 @@
 INSERT INTO stackSummary (sass_id,projection_cell,path_base) VALUES (
-       %lld,   -- warp_id
+       %lld,   -- sass_id
        '%s',   -- projection_cell
        '%s'    -- path_base

branches/eam_branches/ps2-tc3-20130727/ippTools/share/staticskytool_skycalresult.sql

@@ -2 +2 @@
     skycalResult.*,
     skycalRun.stack_id,
+    skycalRun.workdir,
     stackRun.filter,
     skycalRun.state,
     skycalRun.label,
     skycalRun.data_group,
+    skycalRun.dist_group,
     skycalRun.sky_id,
     skycell.*

branches/eam_branches/ps2-tc3-20130727/ippTools/share/warptool_scmap.sql

@@ -8 +8 @@
     chipProcessedImfile.chip_id,
     chipRun.state,
+    chipRun.data_group as chip_data_group,
     chipProcessedImfile.data_state,
     chipProcessedImfile.fault AS chip_fault,

branches/eam_branches/ps2-tc3-20130727/ippTools/share/warptool_warped.sql

@@ -4 +4 @@
     warpRun.workdir,
     warpRun.label,
+    warpRun.data_group,
     warpImfile.warp_skyfile_id,
     rawExp.exp_id,
@@ -13 +14 @@
     rawExp.decl,
     rawExp.exp_time,
+    camRun.cam_id,
     magicDSRun.state AS dsRun_state,
     IFNULL(magicDSRun.magic_ds_id, 0) AS magic_ds_id