Index: trunk/ippTools/share/pxadmin_create_tables.sql
===================================================================
--- trunk/ippTools/share/pxadmin_create_tables.sql	(revision 42387)
+++ trunk/ippTools/share/pxadmin_create_tables.sql	(revision 42837)
@@ -394,5 +394,4 @@
     KEY(fault),
     KEY(quality),
-    KEY(data_state),
     FOREIGN KEY(chip_id, exp_id) REFERENCES chipRun(chip_id, exp_id),
     FOREIGN KEY(exp_id, class_id) REFERENCES rawImfile(exp_id, class_id)
@@ -558,4 +557,5 @@
     minidvodb_group VARCHAR(64),
     minidvodb_name VARCHAR(64),
+    minidvodb_host VARCHAR(64),
     PRIMARY KEY(add_id),
     KEY(add_id),
@@ -1414,140 +1414,4 @@
 ) ENGINE=innodb DEFAULT CHARSET=latin1;
 
-CREATE TABLE pstampDataStore (
-        ds_id BIGINT AUTO_INCREMENT,
-        state VARCHAR(64),
-        lastFileset VARCHAR(64),
-        timestamp  DATETIME,
-        label VARCHAR(64),
-        outProduct VARCHAR(64) UNIQUE,
-        uri VARCHAR(255),
-        pollInterval INTEGER DEFAULT 60,
-        need_magic TINYINT,
-        PRIMARY KEY(ds_id),
-        KEY(ds_id)
-) ENGINE=innodb DEFAULT CHARSET=latin1;
-
-CREATE TABLE pstampProject (
-        proj_id BIGINT AUTO_INCREMENT,
-        name VARCHAR(64) UNIQUE,
-        state VARCHAR(64),
-        dbname VARCHAR(64),
-        dvodb VARCHAR(64),
-        camera VARCHAR(64),
-        telescope VARCHAR(64),
-        need_magic TINYINT,
-        PRIMARY KEY(proj_id),
-        KEY(proj_id)
-) ENGINE=innodb DEFAULT CHARSET=latin1;
-
-CREATE TABLE pstampRequest (
-        req_id BIGINT AUTO_INCREMENT,
-        ds_id BIGINT,
-        state VARCHAR(64),
-        name VARCHAR(64) UNIQUE,
-        reqType VARCHAR(16),
-        label VARCHAR(64),
-        outProduct VARCHAR(64),
-        uri VARCHAR(255),
-        outdir VARCHAR(255),
-        username VARCHAR(255),
-        proj_id BIGINT,
-        registered datetime,
-        timestamp TIMESTAMP DEFAULT CURRENT_TIMESTAMP,
-        fault SMALLINT,
-        PRIMARY KEY(req_id),
-        KEY(req_id),
-        KEY(state),
-        KEY(fault),
-        KEY(label),
-        KEY(username)
-) ENGINE=innodb DEFAULT CHARSET=latin1;
-
-CREATE TABLE pstampJob (
-        job_id BIGINT AUTO_INCREMENT,
-        req_id BIGINT,
-        rownum VARCHAR(64),
-        state VARCHAR(64),
-        jobType VARCHAR(16),
-        fault SMALLINT,
-        exp_id BIGINT,
-        outputBase VARCHAR(255),
-        options BIGINT,
-        dep_id BIGINT,
-        fault_count INT,
-        parent_id BIGINT DEFAULT NULL,
-        is_parent TINYINT DEFAULT 0,
-        PRIMARY KEY(job_id, req_id),
-        KEY(job_id),
-        KEY(req_id),
-        KEY(state),
-        KEY(fault),
-        KEY(dep_id),
-        KEY(parent_id),
-        KEY(is_parent),
-        FOREIGN KEY(req_id) REFERENCES pstampRequest(req_id)
-) ENGINE=innodb DEFAULT CHARSET=latin1;
-
-CREATE TABLE pstampDependent (
-        dep_id BIGINT AUTO_INCREMENT,
-        state      VARCHAR(64),
-        stage      VARCHAR(64),
-        stage_id   BIGINT,
-        component  VARCHAR(64),
-        imagedb    VARCHAR(64),
-        outdir     VARCHAR(255),
-        rlabel     VARCHAR(64),
-        need_magic TINYINT,
-        fault      SMALLINT,
-        fault_count INT,
-        PRIMARY KEY(dep_id),
-        KEY(state),
-        KEY(stage),
-        KEY(stage_id),
-        KEY(component),
-        KEY(imagedb),
-        KEY(fault)
-) ENGINE=innodb DEFAULT CHARSET=latin1;
-
-CREATE TABLE pstampFile (
-    file_id BIGINT AUTO_INCREMENT,
-    job_id BIGINT NOT NULL,
-    path VARCHAR(255),
-    PRIMARY KEY(file_id),
-    KEY(job_id)
-) ENGINE=innodb DEFAULT CHARSET=latin1;
-
-CREATE TABLE pstampUserDomain (
-    domainName      VARCHAR(64),
-    accessLevel     INT,
-    defaultProduct  VARCHAR(255),
-    defaultLabel    VARCHAR(64),
-    PRIMARY KEY(domainName)
-) ENGINE=innodb DEFAULT CHARSET=latin1;
-
-CREATE TABLE pstampUser (
-    userName        VARCHAR(64),
-    domainName      VARCHAR(64),
-    accessLevel     INT,
-    defaultProduct  VARCHAR(255),
-    defaultLabel    VARCHAR(64),
-    PRIMARY KEY (userName, domainName)
-) ENGINE=innodb DEFAULT CHARSET=latin1;
-
-CREATE TABLE pstampAccessLevel (
-    proj_id         BIGINT,
-    accessLevel     INT,
-    mjd_min         FLOAT DEFAULT 0,
-    mjd_max         FLOAT DEFAULT 0,
-    PRIMARY KEY (proj_id, accessLevel),
-    UNIQUE KEY (proj_id, accessLevel),
-    FOREIGN KEY(proj_id) REFERENCES pstampProject(proj_id)
-) ENGINE=innodb DEFAULT CHARSET=latin1;
-
-CREATE TABLE pstampWebRequest (
-        num BIGINT AUTO_INCREMENT,
-        PRIMARY KEY(num)
-) ENGINE=innodb DEFAULT CHARSET=latin1;
-
 CREATE TABLE distTarget (
     target_id   BIGINT AUTO_INCREMENT,
@@ -1856,4 +1720,5 @@
     class_id VARCHAR(64) NOT NULL,     -- class (component) identifier
     path_base VARCHAR(255) NOT NULL,   -- root name for outputs
+    data_state VARCHAR(64),   
     magicked BIGINT,                   -- magic_id if magicked
     dtime_script FLOAT,                -- elapsed time for script
@@ -1905,4 +1770,5 @@
     skycell_id VARCHAR(64) NOT NULL,   -- skycell identifier
     path_base VARCHAR(255) NOT NULL,   -- root name for outputs
+    data_state VARCHAR(64),
     magicked BIGINT,                   -- magic_id if magicked
     dtime_script FLOAT,                -- elapsed time for script
@@ -2022,5 +1888,7 @@
        minidvodb_group VARCHAR(64) NOT NULL,
        minidvodb_path VARCHAR(255) NOT NULL,
+       minidvodb_host VARCHAR(64) NOT NULL,
        state VARCHAR(64) NOT NULL,
+       note VARCHAR(255) NOT NULL,
        creation_date TIMESTAMP,
        PRIMARY KEY(minidvodb_id), KEY(minidvodb_name), INDEX(minidvodb_id)
@@ -2168,5 +2036,5 @@
       quality SMALLINT NOT NULL,
       hostname VARCHAR(64) NOT NULL,
-      software_ver VARCHAR(64),
+      software_ver VARCHAR(16),
       fault SMALLINT NOT NULL,
       PRIMARY KEY(skycal_id),
@@ -2481,4 +2349,222 @@
 ) ENGINE=innodb DEFAULT CHARSET=latin1;
 
+CREATE TABLE xcstackCamera (
+        camera_id BIGINT AUTO_INCREMENT,
+        camera VARCHAR(255),
+        PRIMARY KEY(camera_id)
+) ENGINE=innodb DEFAULT CHARSET=latin1;
+
+CREATE TABLE xcstackRun (
+        xcstack_id BIGINT AUTO_INCREMENT,
+        state VARCHAR(64),
+        workdir VARCHAR(255),
+        label VARCHAR(64),
+        data_group VARCHAR(64),
+        dist_group VARCHAR(64),
+        reduction VARCHAR(64),
+        registered DATETIME,
+        skycell_id VARCHAR(64),
+        tess_id VARCHAR(64),
+        filter VARCHAR(64),
+        software_ver VARCHAR(16),
+        note VARCHAR(255),
+        PRIMARY KEY(xcstack_id),
+        KEY(xcstack_id),
+        KEY(state),
+        KEY(skycell_id),
+        KEY(tess_id),
+        KEY(label),
+        KEY(data_group),
+        KEY(dist_group)
+) ENGINE=innodb DEFAULT CHARSET=latin1;
+
+CREATE TABLE xcstackInputSkyfile (
+        xcstack_id BIGINT,
+        camera_id BIGINT,
+        stack_id BIGINT,
+        PRIMARY KEY(xcstack_id, camera_id, stack_id),
+	KEY(xcstack_id),
+	KEY(stack_id),
+        FOREIGN KEY(xcstack_id) REFERENCES xcstackRun(xcstack_id),
+        FOREIGN KEY(camera_id) REFERENCES xcstackCamera(camera_id)
+) ENGINE=innodb DEFAULT CHARSET=latin1;
+
+CREATE TABLE xcstackSumSkyfile (
+        xcstack_id BIGINT,
+        path_base VARCHAR(255),
+        bg DOUBLE,
+        bg_stdev DOUBLE,
+        dtime_stack FLOAT,
+        dtime_script FLOAT,
+        hostname VARCHAR(64),
+        good_frac FLOAT,
+        fault SMALLINT,
+        software_ver VARCHAR(16),
+        quality SMALLINT NOT NULL DEFAULT 0,
+        PRIMARY KEY(xcstack_id),
+        KEY(dtime_stack),
+        KEY(good_frac),
+        KEY(fault),
+        KEY(quality),
+        FOREIGN KEY(xcstack_id) REFERENCES xcstackRun(xcstack_id)
+) ENGINE=innodb DEFAULT CHARSET=latin1;
+
+-- A static sky analysis set
+CREATE TABLE xcskyRun (
+      xcsky_id BIGINT AUTO_INCREMENT, -- unique identifier
+      state VARCHAR(64) NOT NULL,  -- state of run (new, full, etc.)
+      workdir VARCHAR(255) NOT NULL, -- working directory
+      label VARCHAR(64),             -- processing label
+      data_group VARCHAR(64),        -- group for data
+      dist_group VARCHAR(64),        -- group for distribution
+      reduction VARCHAR(64),         -- reduction class (for altering recipe)
+      note VARCHAR(255),             -- note
+      registered TIMESTAMP DEFAULT CURRENT_TIMESTAMP, -- time run was registered
+      PRIMARY KEY(xcsky_id),
+      KEY(state),
+      KEY(label),
+      KEY(data_group),
+      KEY(dist_group)
+) ENGINE=innodb DEFAULT CHARSET=latin1;
+
+-- Inputs for static sky analysis
+CREATE TABLE xcskyInput (
+      xcsky_id BIGINT,             -- static sky identifier
+      xcstack_id BIGINT,          -- stack identifier
+      PRIMARY KEY(xcsky_id,xcstack_id),
+      KEY(xcstack_id),
+      FOREIGN KEY(xcsky_id) REFERENCES xcskyRun(xcsky_id),
+      FOREIGN KEY(xcstack_id) REFERENCES xcstackRun(xcstack_id)
+) ENGINE=innodb DEFAULT CHARSET=latin1;
+
+-- Result of static sky analysis
+CREATE TABLE xcskyResult (
+      xcsky_id BIGINT,             -- static sky identifier
+      path_base VARCHAR(255) NOT NULL, -- root name for outputs
+      dtime_phot FLOAT,                -- elapsed time for photometry
+      dtime_script FLOAT,              -- elapsed time for script
+      sources INT,                     -- number of sources
+      num_inputs INT,                  -- number of input images
+      hostname VARCHAR(64) NOT NULL,   -- host that executed script
+      good_frac FLOAT,                 -- good fraction of skycell
+      quality SMALLINT NOT NULL,       -- bad quality flag
+      fault SMALLINT NOT NULL,         -- fault code
+      PRIMARY KEY(xcsky_id),
+      KEY(good_frac),
+      KEY(fault),
+      KEY(quality),
+      FOREIGN KEY(xcsky_id) REFERENCES xcskyRun(xcsky_id)
+) ENGINE=innodb DEFAULT CHARSET=latin1;
+
+CREATE TABLE xccalRun (
+      xccal_id BIGINT AUTO_INCREMENT, -- unique identifier
+      xcsky_id BIGINT,
+      xcstack_id BIGINT,
+      state VARCHAR(64) NOT NULL,  -- state of run (new, full, etc.)
+      workdir VARCHAR(255) NOT NULL, -- working directory
+      label VARCHAR(64),             -- processing label
+      data_group VARCHAR(64),        -- group for data
+      dist_group VARCHAR(64),        -- group for distribution
+      reduction VARCHAR(64),         -- reduction class (for altering recipe)
+      registered TIMESTAMP DEFAULT CURRENT_TIMESTAMP, -- time run was registered
+      note VARCHAR(255),             -- note
+      PRIMARY KEY(xccal_id),
+      KEY(state),
+      KEY(label),
+      KEY(data_group),
+      KEY(dist_group),
+      KEY(xcsky_id),
+      KEY(xcstack_id),
+      FOREIGN KEY(xcsky_id) REFERENCES xcskyRun(xcsky_id),
+      FOREIGN KEY(xcstack_id) REFERENCES xcstackRun(xcstack_id)
+) ENGINE=innodb DEFAULT CHARSET=latin1;
+
+-- Result of sky calibration analysis
+CREATE TABLE xccalResult (
+      xccal_id BIGINT,
+      path_base VARCHAR(255) NOT NULL,
+      dtime_script FLOAT,
+      dtime_astrom FLOAT,
+      sigma_ra FLOAT,
+      sigma_dec FLOAT,
+      n_astrom INT,
+      n_detections INT,
+      n_extended INT,
+      n_forced INT,
+      zpt_obs FLOAT,
+      zpt_stdev FLOAT,
+      fwhm_major  FLOAT,
+      fwhm_minor  FLOAT,
+      quality SMALLINT NOT NULL,
+      hostname VARCHAR(64) NOT NULL,
+      software_ver VARCHAR(16),
+      fault SMALLINT NOT NULL,
+      PRIMARY KEY(xccal_id),
+      KEY(fault),
+      KEY(quality),
+      FOREIGN KEY(xccal_id) REFERENCES xccalRun(xccal_id)
+) ENGINE=innodb DEFAULT CHARSET=latin1;
+
+CREATE TABLE xcForceRun (
+    xcff_id         BIGINT NOT NULL AUTO_INCREMENT,
+    xccal_id        BIGINT, -- NOT a foreign key: reference to entry in xcamera db
+    sources_path_base VARCHAR(255),
+    state           VARCHAR(64),
+    workdir         VARCHAR(255),
+    label           VARCHAR(64),
+    skycell_id      VARCHAR(64),
+    tess_id         VARCHAR(64),
+    data_group      VARCHAR(64),
+    dist_group      VARCHAR(64),
+    note            VARCHAR(255),
+    reduction       VARCHAR(64),
+    registered TIMESTAMP DEFAULT CURRENT_TIMESTAMP, -- time run was registered
+    PRIMARY KEY(xcff_id),
+    KEY(state),
+    KEY(label),
+    KEY(data_group),
+    KEY(xccal_id)
+) ENGINE=innodb DEFAULT CHARSET=latin1;
+
+CREATE TABLE xcForceInput (
+    xcff_id              BIGINT,
+    warp_id              BIGINT,
+    camera_id            BIGINT,
+    PRIMARY KEY(xcff_id, warp_id, camera_id),
+    FOREIGN KEY(xcff_id)   REFERENCES xcForceRun(xcff_id),
+    FOREIGN KEY(warp_id)   REFERENCES warpRun(warp_id),
+    FOREIGN KEY(camera_id) REFERENCES xcstackCamera(camera_id)
+) ENGINE=innodb DEFAULT CHARSET=latin1;
+
+CREATE TABLE xcForceResult (
+    xcff_id         BIGINT,
+    warp_id         BIGINT,
+    path_base       VARCHAR(255) NOT NULL,
+    dtime_script    FLOAT,
+    quality         SMALLINT NOT NULL,
+    hostname        VARCHAR(64) NOT NULL,
+    software_ver    VARCHAR(16),
+    fault           SMALLINT NOT NULL,
+    PRIMARY KEY(xcff_id, warp_id),
+    KEY(fault),
+    KEY(quality),
+    FOREIGN KEY(xcff_id) REFERENCES xcForceRun(xcff_id),
+    FOREIGN KEY(warp_id) REFERENCES warpRun(warp_id)
+) ENGINE=innodb DEFAULT CHARSET=latin1;
+
+CREATE TABLE xcForceSummary (
+    xcff_id         BIGINT,
+    path_base       VARCHAR(255) NOT NULL,
+    dtime_script    FLOAT,
+    quality         SMALLINT NOT NULL,
+    hostname        VARCHAR(64) NOT NULL,
+    software_ver    VARCHAR(16),
+    fault           SMALLINT NOT NULL,
+    PRIMARY KEY(xcff_id),
+    KEY(fault),
+    KEY(quality),
+    FOREIGN KEY(xcff_id) REFERENCES xcForceRun(xcff_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.