Changeset 25816 for trunk/ippTools/share

Timestamp:

Oct 8, 2009, 5:09:53 PM (17 years ago)

Author:

eugene

Message:

updates to the addstar stage; modify flatcorr to interact correctly with the addstar stage

Location:

trunk/ippTools/share

Files:

• Makefile.am (modified) (1 diff)
• addtool_find_pendingexp.sql (modified) (3 diffs)
• addtool_queue_cam_id.sql (modified) (1 diff)
• flatcorr_camerarundone.sql (added)
• flatcorr_chiprundone.sql (modified) (2 diffs)
• flatcorr_pendingprocess.sql (modified) (1 diff)
• pxadmin_create_tables.sql (modified) (4 diffs)
• pxadmin_drop_tables.sql (modified) (1 diff)

trunk/ippTools/share/Makefile.am

@@ -152 +152 @@
      faketool_unmasked.sql \
      flatcorr_chiprundone.sql \
+     flatcorr_camerarundone.sql \
      flatcorr_pendingprocess.sql \
      flatcorr_inputimfile.sql \

trunk/ippTools/share/addtool_find_pendingexp.sql

@@ -1 +1 @@
 SELECT
     addRun.*,
+    camProcessedExp.path_base as camroot,
     rawExp.exp_tag,
     rawExp.exp_id,
@@ -9 +10 @@
 FROM addRun
 JOIN camRun
+    USING(cam_id)
+JOIN camProcessedExp
     USING(cam_id)
 JOIN chipRun
@@ -21 +24 @@
     camRun.state = 'full'
     AND ((addRun.state = 'new' AND addProcessedExp.add_id IS NULL) OR addRun.state = 'update')
+    AND addRun.dvodb IS NOT NULL
+    AND addRun.workdir IS NOT NULL
     AND addMask.label IS NULL
 

trunk/ippTools/share/addtool_queue_cam_id.sql

@@ -6 +6 @@
         '%s',           -- workdir
         '%s',           -- workdir_state
+        '%s',           -- reduction
         '%s',           -- label
         '%s',           -- dvodb 
-        0               -- magicked
+        %d              -- image_only
     FROM camRun
     WHERE

trunk/ippTools/share/flatcorr_chiprundone.sql

@@ -1 +1 @@
 SELECT
     corr_id,
-    cam_id,
     chipRun.*
 FROM flatcorrRun
@@ -14 +13 @@
     AND flatcorrChipLink.include = 1
     AND chipRun.state = 'full'
-    AND camRun.cam_id is NULL;
+    AND camRun.cam_id is NULL

trunk/ippTools/share/flatcorr_pendingprocess.sql

@@ -10 +10 @@
   reduction,
   region,
-  chip_count,
-  cam_count
+  cam_count,
+  add_count
 FROM 
   (SELECT 
      flatcorrRun.*,
-     flatcorrChipLink.corr_id as chip_corr_id,
-     count(flatcorrChipLink.chip_id) as chip_count
+     flatcorrCamLink.corr_id as cam_corr_id,
+     count(flatcorrCamLink.cam_id) as cam_count
    FROM flatcorrRun
-   JOIN flatcorrChipLink
-     ON flatcorrChipLink.corr_id = flatcorrRun.corr_id
-  WHERE flatcorrChipLink.include = 1
+   JOIN flatcorrCamLink
+  USING (corr_id)
+  WHERE flatcorrCamLink.include = 1
    GROUP BY
-     flatcorrChipLink.corr_id) AS t1
+     flatcorrCamLink.corr_id) AS t1
 LEFT JOIN
   (SELECT 
-     flatcorrCamLink.corr_id as cam_corr_id,
-     count(flatcorrCamLink.cam_id) as cam_count
-   FROM flatcorrCamLink
-   JOIN camRun
-       ON flatcorrCamLink.cam_id = camRun.cam_id
-   WHERE camRun.state = 'full'
-     AND flatcorrCamLink.include = 1
+     flatcorrAddstarLink.corr_id as add_corr_id,
+     count(flatcorrAddstarLink.add_id) as add_count
+   FROM flatcorrAddstarLink
+   JOIN addRun
+   USING (add_id)
+   WHERE addRun.state = 'full'
+     AND flatcorrAddstarLink.include = 1
    GROUP BY
-       flatcorrCamLink.corr_id) AS t2
-ON t1.chip_corr_id = t2.cam_corr_id
-WHERE chip_count = cam_count
+       flatcorrAddstarLink.corr_id) AS t2
+ON t1.cam_corr_id = t2.add_corr_id
+WHERE cam_count = add_count
 AND state = 'new'

trunk/ippTools/share/pxadmin_create_tables.sql

@@ -464 +464 @@
     workdir VARCHAR(255),
     workdir_state VARCHAR(64),
+    reduction VARCHAR(64),
     label VARCHAR(64),
     dvodb VARCHAR(255),
-    magicked BIGINT,
+    image_only TINYINT,
     PRIMARY KEY(add_id),
     KEY(add_id),
@@ -480 +481 @@
     add_id BIGINT AUTO_INCREMENT,
     dtime_addstar FLOAT,
-    n_stars INT,
     path_base VARCHAR(255),
     fault SMALLINT NOT NULL,
@@ -1182 +1182 @@
 ) ENGINE=innodb DEFAULT CHARSET=latin1;
 
--- these two tables link the flatcorrRun to the associated chip and camera runs
+-- these three tables link the flatcorrRun to the associated chip, camera, and addstar runs
 CREATE TABLE flatcorrChipLink (
         corr_id BIGINT,
@@ -1201 +1201 @@
         FOREIGN KEY(chip_id) REFERENCES chipRun(chip_id),
         FOREIGN KEY(cam_id) REFERENCES camRun(cam_id)
+) ENGINE=innodb DEFAULT CHARSET=latin1;
+
+CREATE TABLE flatcorrAddstarLink (
+        corr_id BIGINT,
+        cam_id BIGINT,
+        add_id BIGINT,
+        include TINYINT,
+        PRIMARY KEY(corr_id, cam_id, add_id),
+        FOREIGN KEY (corr_id)  REFERENCES  flatcorrRun(corr_id),
+        FOREIGN KEY (cam_id)  REFERENCES  camRun(cam_id),
+        FOREIGN KEY (add_id)  REFERENCES  addRun(add_id)
 ) ENGINE=innodb DEFAULT CHARSET=latin1;
 

trunk/ippTools/share/pxadmin_drop_tables.sql

@@ -59 +59 @@
 DROP TABLE IF EXISTS flatcorrChipLink;
 DROP TABLE IF EXISTS flatcorrCamLink;
+DROP TABLE IF EXISTS flatcorrAddstarLink;
 DROP TABLE IF EXISTS pstampDataStore;
 DROP TABLE IF EXISTS pstampProject;