Changeset 42387 for trunk/ippTools/share

Timestamp:

Feb 8, 2023, 12:14:39 PM (3 years ago)

Author:

eugene

Message:

merge from eam_branches/ipp-20220316. add safety to pxadmin to prevent drop of ops dbs, add fpcamera, more flexibility in ippadmin for testing; prevent pzgetexp from trying to download too many exposures

Location:

trunk/ippTools

Files:

• . (modified) (1 prop)
• share (modified) (1 prop)
• share/Makefile.am (modified) (1 diff)
• share/fpcamtool_find_cam_and_chip_id.sql (copied) (copied from branches/eam_branches/ipp-20220316/ippTools/share/fpcamtool_find_cam_and_chip_id.sql )
• share/fpcamtool_find_cam_id.sql (copied) (copied from branches/eam_branches/ipp-20220316/ippTools/share/fpcamtool_find_cam_id.sql )
• share/fpcamtool_find_processedexp.sql (copied) (copied from branches/eam_branches/ipp-20220316/ippTools/share/fpcamtool_find_processedexp.sql )
• share/fpcamtool_inputastrom.sql (copied) (copied from branches/eam_branches/ipp-20220316/ippTools/share/fpcamtool_inputastrom.sql )
• share/fpcamtool_inputchips.sql (copied) (copied from branches/eam_branches/ipp-20220316/ippTools/share/fpcamtool_inputchips.sql )
• share/fpcamtool_pendingexp.sql (copied) (copied from branches/eam_branches/ipp-20220316/ippTools/share/fpcamtool_pendingexp.sql )
• share/fpcamtool_queue_cam_id.sql (copied) (copied from branches/eam_branches/ipp-20220316/ippTools/share/fpcamtool_queue_cam_id.sql )
• share/fpcamtool_revertprocessedexp.sql (copied) (copied from branches/eam_branches/ipp-20220316/ippTools/share/fpcamtool_revertprocessedexp.sql )
• share/fpcamtool_revertupdatedexp.sql (copied) (copied from branches/eam_branches/ipp-20220316/ippTools/share/fpcamtool_revertupdatedexp.sql )
• share/pxadmin_create_tables.sql (modified) (1 diff)
• share/pxadmin_drop_tables.sql (modified) (1 diff)

trunk/ippTools/share/Makefile.am

@@ -543 +543 @@
         remotetool_listcomponent.sql \
         remotetool_doneprep.sql \
-        remotetool_updatepoll.sql
+        remotetool_updatepoll.sql \
+        fpcamtool_find_cam_and_chip_id.sql \
+        fpcamtool_find_cam_id.sql \
+        fpcamtool_find_processedexp.sql \
+        fpcamtool_pendingexp.sql \
+        fpcamtool_inputchips.sql \
+        fpcamtool_inputastrom.sql \
+        fpcamtool_queue_cam_id.sql \
+        fpcamtool_revertprocessedexp.sql \
+        fpcamtool_revertupdatedexp.sql
+

trunk/ippTools/share/pxadmin_create_tables.sql

@@ -2427 +2427 @@
 ) ENGINE=innodb DEFAULT CHARSET=latin1;
 
+CREATE TABLE fpcamRun (
+    fpcam_id      BIGINT AUTO_INCREMENT,
+    cam_id        BIGINT,
+    chip_id       BIGINT,
+    state         VARCHAR(64),
+    workdir       VARCHAR(255),
+    workdir_state VARCHAR(64),
+    label         VARCHAR(64),
+    data_group    VARCHAR(64),
+    dist_group    VARCHAR(64),
+    reduction     VARCHAR(64),
+    dvodb         VARCHAR(255),
+    software_ver  VARCHAR(16),
+    note          VARCHAR(255),
+    PRIMARY KEY(fpcam_id),
+    KEY(cam_id),
+    KEY(chip_id),
+    KEY(state),
+    KEY(label),
+    INDEX(chip_id, cam_id),
+    FOREIGN KEY (cam_id) REFERENCES camRun(cam_id),
+    FOREIGN KEY (chip_id) REFERENCES chipRun(chip_id))
+ENGINE=innodb DEFAULT CHARSET=latin1;
+
+CREATE TABLE fpcamProcessedExp (
+    fpcam_id     BIGINT,
+    path_base    VARCHAR(255),
+
+    zpt_obs      FLOAT,
+    zpt_stdev    FLOAT,
+    zpt_lq       FLOAT,
+    zpt_uq       FLOAT,
+
+    dtime_script FLOAT,
+
+    hostname     VARCHAR(64),
+    n_stars      INT,
+    fault        SMALLINT NOT NULL,
+    epoch        TIMESTAMP DEFAULT CURRENT_TIMESTAMP,
+
+    software_ver VARCHAR(16),
+
+    deteff_obs   FLOAT,
+    deteff_err   FLOAT,
+    deteff_lq    FLOAT,
+    deteff_uq    FLOAT,
+
+    quality      SMALLINT,
+
+    PRIMARY KEY(fpcam_id),
+    KEY(fault),
+    FOREIGN KEY (fpcam_id) REFERENCES fpcamRun(fpcam_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.

trunk/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