Changeset 42207 for branches/eam_branches/ipp-20220316/ippTools/share

Timestamp:

May 17, 2022, 3:30:24 PM (4 years ago)

Author:

eugene

Message:

add fpcamtool support

Location:

branches/eam_branches/ipp-20220316/ippTools/share

Files:

• Makefile.am (modified) (1 diff)
• fpcamtool_find_cam_and_chip_id.sql (modified) (1 diff)
• fpcamtool_inputastrom.sql (added)
• fpcamtool_inputchips.sql (added)
• fpcamtool_pendingexp.sql (modified) (2 diffs)
• fpcamtool_revertprocessedexp.sql (modified) (1 diff)
• pxadmin_create_tables.sql (modified) (1 diff)
• pxadmin_drop_tables.sql (modified) (1 diff)

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

@@ -549 +549 @@
         fpcamtool_find_processedexp.sql \
         fpcamtool_pendingexp.sql \
+        fpcamtool_inputchips.sql \
+        fpcamtool_inputastrom.sql \
         fpcamtool_queue_cam_id.sql \
         fpcamtool_revertprocessedexp.sql \

branches/eam_branches/ipp-20220316/ippTools/share/fpcamtool_find_cam_and_chip_id.sql

@@ -5 +5 @@
  SELECT
      exp_id,
-     chip_id,
+     chip_id
  FROM chipRun
  JOIN rawExp

branches/eam_branches/ipp-20220316/ippTools/share/fpcamtool_pendingexp.sql

@@ -18 +18 @@
 LEFT JOIN fpcamProcessedExp
     USING(fpcam_id)
-LEFT JOIN fpcamMask
-    ON fpcamRun.label = fpcamMask.label
 LEFT JOIN Label
     ON fpcamRun.label = Label.label
@@ -25 +23 @@
     chipRun.state = 'full'
     AND camRun.state = 'full'
-    AND ((fpcamRun.state = 'new'    AND fpcamProcessedExp.cam_id IS NULL) OR
+    AND ((fpcamRun.state = 'new'    AND fpcamProcessedExp.fpcam_id IS NULL) OR
          (fpcamRun.state = 'update' AND fpcamProcessedExp.fault = 0 AND fpcamProcessedExp.quality = 0))
-    AND fpcamMask.label IS NULL
     AND (Label.active OR Label.active IS NULL)

branches/eam_branches/ipp-20220316/ippTools/share/fpcamtool_revertprocessedexp.sql

@@ -2 +2 @@
 USING fpcamProcessedExp, fpcamRun, camRun, chipRun, rawExp
 WHERE
-    fpcamRun.cam_id      = fpcamProcessedExp.cam_id
+    fpcamRun.fpcam_id      = fpcamProcessedExp.fpcam_id
     AND fpcamRun.cam_id  = camRun.cam_id
     AND fpcamRun.chip_id = chipRun.chip_id

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

@@ -2474 +2474 @@
     deteff_uq    FLOAT,
 
-    quality      SMALLINT
+    quality      SMALLINT,
 
     PRIMARY KEY(fpcam_id),
     KEY(fault),
-    FOREIGN KEY (fpcam_id) REFERENCES fpcamRun(fpcam_id),
+    FOREIGN KEY (fpcam_id) REFERENCES fpcamRun(fpcam_id)
 ) ENGINE=innodb DEFAULT CHARSET=latin1;
 

branches/eam_branches/ipp-20220316/ippTools/share/pxadmin_drop_tables.sql

@@ -129 +129 @@
 DROP TABLE IF EXISTS remoteComponent;
 DROP TABLE IF EXISTS remoteRun;
-
+DROP TABLE IF EXISTS fpcamProcessedExp;
+DROP TABLE IF EXISTS fpcamRun;
 
 SET FOREIGN_KEY_CHECKS=1