Changeset 35096 for branches/eam_branches/ipp-20121219/ippTools/share

Timestamp:

Feb 6, 2013, 2:34:49 PM (13 years ago)

Author:

eugene

Message:

merging changes from trunk

Location:

branches/eam_branches/ipp-20121219

Files:

• . (modified) (1 prop)
• ippTools/share/Makefile.am (modified) (1 diff)
• ippTools/share/bgtool_definechip.sql (modified) (1 diff)
• ippTools/share/camtool_find_pendingimfile.sql (modified) (1 prop)
• ippTools/share/chiptool_setimfiletoupdate.sql (modified) (1 prop)
• ippTools/share/pxadmin_create_tables.sql (modified) (1 diff, 1 prop)
• ippTools/share/pxadmin_drop_tables.sql (modified) (1 diff)
• ippTools/share/releasetool_definerelexp.sql (copied) (copied from trunk/ippTools/share/releasetool_definerelexp.sql )
• ippTools/share/releasetool_listrelease.sql (copied) (copied from trunk/ippTools/share/releasetool_listrelease.sql )
• ippTools/share/releasetool_listrelexp.sql (copied) (copied from trunk/ippTools/share/releasetool_listrelexp.sql )
• ippTools/share/releasetool_listsurvey.sql (copied) (copied from trunk/ippTools/share/releasetool_listsurvey.sql )
• ippTools/share/stacktool_tobkg.sql (modified) (1 diff)
• ippTools/share/staticskytool_defineskycalrun.sql (modified) (2 diffs)
• ippTools/share/staticskytool_revert.sql (modified) (1 diff)
• ippTools/share/staticskytool_revertskycal.sql (modified) (1 diff)
• ippTools/share/staticskytool_skycalresult.sql (modified) (1 diff)
• ippTools/share/warptool_towarped.sql (modified) (1 prop)

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

@@ -461 +461 @@
         vptool_processedcell.sql \
         vptool_revertrun.sql \
-        sctool_list.sql
+        sctool_list.sql \
+        releasetool_listsurvey.sql \
+        releasetool_listrelease.sql \
+        releasetool_listrelexp.sql \
+        releasetool_definerelexp.sql
 

branches/eam_branches/ipp-20121219/ippTools/share/bgtool_definechip.sql

@@ -3 +3 @@
 FROM chipRun
 JOIN rawExp USING(exp_id)
+JOIN camRun USING(chip_id)
+JOIN camProcessedExp USING(cam_id)
 LEFT JOIN chipBackgroundRun USING(chip_id)
 WHERE chipRun.state = 'full'
+AND camRun.state = 'full'
+AND camProcessedExp.quality = 0

branches/eam_branches/ipp-20121219/ippTools/share/pxadmin_create_tables.sql

@@ -2148 +2148 @@
 ) ENGINE=InnoDB DEFAULT CHARSET=latin1;
 
-
--- This comment line is here to avoid empty query error.
+CREATE TABLE survey (
+    surveyID    INT(8),
+    surveyName  VARCHAR(16) NOT NULL,
+    description VARCHAR(255),
+    PRIMARY KEY(surveyID),
+    UNIQUE  KEY(name)
+) ENGINE=InnoDB CHARSET=latin1;
+
+
+CREATE TABLE ippRelease (
+    rel_id      INT(8) AUTO_INCREMENT,
+    surveyID    INT(8),
+    releaseName VARCHAR(64),
+    relase_state VARCHAR(16),   -- active, pending, archive, drop 
+    dataRelease INT(8),         -- PSPS dataRelease
+    priority    INT(8),
+    PRIMARY KEY(rel_id),
+    KEY(releaseName),
+    KEY(state),
+    KEY(priority),
+    FOREIGN KEY(surveyID) REFERENCES survey(surveyID)
+) ENGINE=Innodb DEFAULT CHARSET=latin1;
+
+CREATE TABLE relExp (
+    relexp_id   BIGINT AUTO_INCREMENT,
+    rel_id      INT(8),
+    exp_id      BIGINT,
+    chip_id     BIGINT,         -- links to the runs that supplied the data
+    cam_id      BIGINT,         -- for this release
+    state       VARCHAR(16),    -- released, pending, archive, drop  
+    flags       INT UNSIGNED,   -- flags for relphot, relastro, ??
+    zpt_obs     FLOAT,          -- calibrated zero point for this release of
+    zpt_stdev   FLOAT,          -- this exposure
+    path_base   VARCHAR(255),   -- path_base of any supporting files for this
+                                -- release of this exposure.
+    registered  DATETIME,       -- insertion time for this row
+    time_stamp  DATETIME,       -- time of last update for this row
+    PRIMARY KEY (relexp_id),
+    FOREIGN KEY(rel_id) REFERENCES ippRelease(rel_id),
+    KEY (state),
+    FOREIGN KEY(exp_id) REFERENCES rawExp(exp_id),
+    FOREIGN KEY(chip_id) REFERENCES chipRun(chip_id),
+    FOREIGN KEY(cam_id) REFERENCES camRun(cam_id)
+) ENGINE=innodb DEFAULT CHARSET=latin1;
+
+CREATE TABLE relStack (
+    relstack_id BIGINT AUTO_INCREMENT,
+    rel_id      INT(8),
+    skycal_id   BIGINT,         -- id of the sky calibration run that supplied the calibration
+                                -- for this release. We get back to stack from here
+    skycell_id  varchar(64),
+    tess_id     varchar(64),
+    state       VARCHAR(16),    -- released, pending, archive, drop  
+    flags       INT UNSIGNED,
+    stack_type  VARCHAR(16),    -- nightly, deep, reference
+    zpt_obs     FLOAT,          -- calibrated zero point for this release of this skycell
+    zpt_stdev   FLOAT,
+    fwhm_major  FLOAT,          -- seeing as measured by staticsky
+    path_base   VARCHAR(255),   -- path_base of any supporting files,
+    registered  DATETIME,
+    time_stamp  DATETIME,
+    PRIMARY KEY (relstack_id),
+    KEY (tess_id, skycell_id),
+    KEY (rel_id, tess_id, skycell_id),
+    FOREIGN KEY(rel_id) REFERENCES ippRelease(rel_id),
+    FOREIGN KEY(skycal_id) REFERENCES skycalRun(skycal_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/ipp-20121219/ippTools/share/pxadmin_drop_tables.sql

@@ -109 +109 @@
 DROP TABLE IF EXISTS skycalResult;
 DROP TABLE IF EXISTS skycell;
+DROP TABLE IF EXISTS relExp;
+DROP TABLE IF EXISTS ippRelease;
+DROP TABLE IF EXISTS survey;
 
 SET FOREIGN_KEY_CHECKS=1

branches/eam_branches/ipp-20121219/ippTools/share/stacktool_tobkg.sql

@@ -25 +25 @@
     -- WHERE hook %s
 GROUP BY stack_id
-HAVING (SUM(IF(warpRun.state = 'full', 1, 0)) = COUNT(stackInputSkyfile.warp_id) AND
+HAVING ((SUM(IF(warpRun.state = 'cleaned', 1, 0)) = COUNT(stackInputSkyfile.warp_id) OR
+         SUM(IF(warpRun.state = 'full', 1, 0)) = COUNT(stackInputSkyfile.warp_id)) AND
         SUM(IF(warpSkyfile.background_model = 1, 1, 0)) = COUNT(stackInputSkyfile.warp_id))
 

branches/eam_branches/ipp-20121219/ippTools/share/staticskytool_defineskycalrun.sql

@@ -1 +1 @@
 SELECT
-    sky_id,
-    stack_id,
+    staticskyRun.sky_id,
+    stackRun.stack_id,
     skycell_id,
     filter,
@@ -14 +14 @@
     JOIN stackSumSkyfile USING(stack_id)
     JOIN skycell USING(tess_id, skycell_id)
-    LEFT JOIN skycalRun USING(sky_id, stack_id)
+    LEFT JOIN skycalRun ON staticskyRun.sky_id = skycalRun.sky_id AND stackRun.stack_id = skycalRun.stack_id -- join hook %s
 WHERE staticskyRun.state = 'full'
     AND staticskyResult.quality = 0

branches/eam_branches/ipp-20121219/ippTools/share/staticskytool_revert.sql

@@ -1 +1 @@
 DELETE FROM staticskyResult
-USING staticskyResult, staticskyRun
+USING staticskyResult, staticskyRun, staticskyInput, stackRun, skycell
 WHERE staticskyRun.sky_id = staticskyResult.sky_id
+    AND staticskyRun.sky_id = staticskyInput.sky_id
+    AND staticskyInput.stack_id = stackRun.stack_id
+    AND stackRun.tess_id = skycell.tess_id
+    AND stackRun.skycell_id = skycell.skycell_id
     AND staticskyRun.state = 'new'
     AND staticskyResult.fault != 0

branches/eam_branches/ipp-20121219/ippTools/share/staticskytool_revertskycal.sql

@@ -1 +1 @@
 DELETE FROM skycalResult
-USING skycalResult, skycalRun, stackRun
+USING skycalResult, skycalRun, stackRun, skycell
 WHERE skycalRun.skycal_id = skycalResult.skycal_id
     AND stackRun.stack_id = skycalRun.stack_id
     AND skycalRun.state = 'new'
     AND skycalResult.fault != 0
+    AND stackRun.tess_id = skycell.tess_id
+    AND stackRun.skycell_id = skycell.skycell_id

branches/eam_branches/ipp-20121219/ippTools/share/staticskytool_skycalresult.sql

@@ -2 +2 @@
     skycalResult.*,
     skycalRun.stack_id,
-    stackRun.tess_id,
-    stackRun.skycell_id,
     stackRun.filter,
     skycalRun.state,
     skycalRun.label,
     skycalRun.data_group,
-    skycalRun.sky_id
+    skycalRun.sky_id,
+    skycell.*
 FROM skycalRun
 JOIN skycalResult USING(skycal_id)
-JOIN stackRun USING(stack_id)
-
+JOIN stackRun USING(stack_id) 
+JOIN skycell USING(tess_id, skycell_id)