Changeset 27839 for branches/simmosaic_branches/ippTools/share/flatcorr_pendingprocess.sql

Timestamp:

May 3, 2010, 8:45:22 AM (16 years ago)

Author:

eugene

Message:

updates from trunk

Location:

branches/simmosaic_branches

Files:

• . (modified) (1 prop)
• ippTools/share/flatcorr_pendingprocess.sql (modified) (1 diff)

branches/simmosaic_branches/ippTools/share/flatcorr_pendingprocess.sql

@@ -6 +6 @@
   filter,
   state,
+  make_corr,
   workdir,
   label,
   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'