Changeset 36071 for branches/eam_branches/ipp-20130711/ippTools/share

Timestamp:

Aug 30, 2013, 4:48:58 PM (13 years ago)

Author:

eugene

Message:

updates from trunk

Location:

branches/eam_branches/ipp-20130711/ippTools/share

Files:

• . (modified) (1 prop)
• Makefile.am (modified) (5 diffs)
• camtool_find_pendingimfile.sql (modified) (1 prop)
• camtool_pendingexp.sql (modified) (1 diff)
• chiptool_setimfiletoupdate.sql (modified) (1 prop)
• disttool_definebyquery_sky.sql (modified) (1 diff)
• disttool_definebyquery_skycal.sql (copied) (copied from trunk/ippTools/share/disttool_definebyquery_skycal.sql )
• disttool_pending_skycal.sql (copied) (copied from trunk/ippTools/share/disttool_pending_skycal.sql )
• disttool_toadvance.sql (modified) (1 diff)
• pxadmin_create_tables.sql (modified) (3 diffs, 1 prop)
• pxadmin_drop_tables.sql (modified) (1 diff)
• regtool_pendingburntoolimfile.sql (modified) (1 diff)
• releasetool_listrelexp.sql (modified) (2 diffs)
• releasetool_stacksummary.sql (copied) (copied from trunk/ippTools/share/releasetool_stacksummary.sql )
• releasetool_summary.sql (copied) (copied from trunk/ippTools/share/releasetool_summary.sql )
• stacktool_summary.sql (copied) (copied from trunk/ippTools/share/stacktool_summary.sql )
• stacktool_tosummary.sql (modified) (2 diffs)
• staticskytool_export_skycalresult.sql (copied) (copied from trunk/ippTools/share/staticskytool_export_skycalresult.sql )
• staticskytool_export_skycalrun.sql (copied) (copied from trunk/ippTools/share/staticskytool_export_skycalrun.sql )
• staticskytool_skycalresult.sql (modified) (1 diff)
• warptool_scmap.sql (modified) (1 diff)
• warptool_towarped.sql (modified) (1 prop)
• warptool_warped.sql (modified) (1 diff)

branches/eam_branches/ipp-20130711/ippTools/share/Makefile.am

@@ -193 +193 @@
         disttool_definebyquery_sky.sql \
         disttool_definebyquery_sky_singlefilter.sql \
+        disttool_definebyquery_skycal.sql \
         disttool_definebyquery_stack.sql \
         disttool_definebyquery_warp.sql \
@@ -207 +208 @@
         disttool_pending_raw.sql \
         disttool_pending_sky.sql \
+        disttool_pending_skycal.sql \
         disttool_pending_stack.sql \
         disttool_pending_warp.sql \
@@ -398 +400 @@
         stacktool_tosummary.sql \
         stacktool_addsummary.sql \
+        stacktool_summary.sql \
         staticskytool_definebyquery_select.sql \
         staticskytool_definebyquery_select_by_dg.sql \
@@ -408 +411 @@
         staticskytool_export_input.sql \
         staticskytool_export_result.sql \
+        staticskytool_export_skycalrun.sql \
+        staticskytool_export_skycalresult.sql \
         staticskytool_inputs.sql \
         staticskytool_todo.sql \
@@ -476 +481 @@
         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_stacksummary.sql \
         releasetool_pendingrelgroup.sql
 

branches/eam_branches/ipp-20130711/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/ipp-20130711/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,

branches/eam_branches/ipp-20130711/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

branches/eam_branches/ipp-20130711/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.
@@ -2273 +2277 @@
 ) ENGINE=innodb DEFAULT CHARSET=latin1;
 
+CREATE TABLE dqstatsRun (
+  dqstats_id BIGINT NOT NULL AUTO_INCREMENT,
+  state VARCHAR(64) DEFAULT NULL,
+  registered TIMESTAMP NOT NULL DEFAULT CURRENT_TIMESTAMP,
+  label VARCHAR(64) DEFAULT NULL,
+  fault SMALLINT NOT NULL,
+  PRIMARY KEY  (dqstats_id),
+  KEY label (label),
+  KEY fault (fault)
+) ENGINE=InnoDB DEFAULT CHARSET=latin1;
+
+CREATE TABLE dqstatsContent (
+  dqstats_id BIGINT,
+  exp_id BIGINT,
+  chip_id BIGINT,
+  cam_id BIGINT,
+  warp_id BIGINT,
+  invalid TINYINT DEFAULT NULL,
+  KEY dqstats_id (dqstats_id),
+  KEY exp_id (exp_id),
+  KEY chip_id (chip_id),
+  KEY cam_id (cam_id),
+  KEY warp_id (warp_id),
+  FOREIGN KEY (dqstats_id) REFERENCES dqstatsRun (dqstats_id),
+  FOREIGN KEY (exp_id) REFERENCES rawExp (exp_id),
+  FOREIGN KEY (chip_id) REFERENCES chipRun (chip_id),
+  FOREIGN KEY (cam_id) REFERENCES camRun (cam_id),
+  FOREIGN KEY (warp_id) REFERENCES warpRun (warp_id)
+) ENGINE=InnoDB DEFAULT CHARSET=latin1;
 
 

branches/eam_branches/ipp-20130711/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;
 
 SET FOREIGN_KEY_CHECKS=1

branches/eam_branches/ipp-20130711/ippTools/share/regtool_pendingburntoolimfile.sql

@@ -12 +12 @@
        newImfile.tmp_class_id,
        summitExp.exp_type,
+       rawImfile.camera AS camera,
        rawImfile.dateobs,
        rawImfile.obs_mode AS obs_mode,

branches/eam_branches/ipp-20130711/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/ipp-20130711/ippTools/share/stacktool_tosummary.sql

@@ -1 @@
-SELECT DISTINCT sass_id,rawExp.camera,stackRun.workdir,stackRun.tess_id,stackRun.state
+SELECT sass_id,camera,workdir,tess_id,state FROM 
+(SELECT sass_id,rawExp.camera,stackRun.workdir,stackRun.tess_id,stackRun.state,
+       sum((stackRun.state = 'full')) AS is_done, sum(1) AS is_defined
        FROM stackRun
        JOIN stackInputSkyfile ON stackRun.stack_id = stackInputSkyfile.stack_id
@@ -12 +14 @@
 WHERE stackRun.state = 'full' AND
       stackSummary.projection_cell IS NULL
+-- WHERE HOOK %s
+GROUP BY sass_id
+) AS T
+WHERE is_done = is_defined

branches/eam_branches/ipp-20130711/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/ipp-20130711/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/ipp-20130711/ippTools/share/warptool_warped.sql

@@ -13 +13 @@
     rawExp.decl,
     rawExp.exp_time,
+    camRun.cam_id,
     magicDSRun.state AS dsRun_state,
     IFNULL(magicDSRun.magic_ds_id, 0) AS magic_ds_id