Changeset 28343

Timestamp:

Jun 15, 2010, 3:27:31 PM (16 years ago)

Author:

Paul Price

Message:

Adding database tables and tools for (re-)photometry of diffs.

Location:

trunk

Files:

• dbconfig/changes.txt (modified) (1 diff)
• dbconfig/diffphot.md (added)
• dbconfig/ipp.m4 (modified) (1 diff)
• ippTools/share/Makefile.am (modified) (1 diff)
• ippTools/share/diffphottool_advance.sql (added)
• ippTools/share/diffphottool_definerun.sql (added)
• ippTools/share/diffphottool_input.sql (added)
• ippTools/share/diffphottool_pending.sql (added)
• ippTools/share/diffphottool_revert.sql (added)
• ippTools/share/pxadmin_create_tables.sql (modified) (5 diffs)
• ippTools/src (modified) (1 prop)
• ippTools/src/Makefile.am (modified) (3 diffs)
• ippTools/src/diffphottool.c (added)
• ippTools/src/diffphottool.h (added)
• ippTools/src/diffphottoolConfig.c (added)

trunk/dbconfig/changes.txt

@@ -1757 +1757 @@
 
 ALTER TABLE pstampRequest ADD COLUMN timestamp TIMESTAMP AFTER outdir;
+
+
+-- Tables to support (re-)photometry of a diff
+CREATE TABLE diffPhotRun (
+    diff_phot_id BIGINT AUTO_INCREMENT, -- Identifier for diffPhotRun
+    diff_id BIGINT NOT NULL,            -- Identifier for diffRun
+    state VARCHAR(64) NOT NULL,         -- State of run
+    workdir VARCHAR(255) NOT NULL, -- working directory
+    label VARCHAR(64),             -- processing label
+    data_group VARCHAR(64),        -- group for data
+    reduction VARCHAR(64),         -- reduction class (for altering recipe)
+    registered TIMESTAMP DEFAULT CURRENT_TIMESTAMP, -- time run was registered
+    note VARCHAR(255),             -- note
+    PRIMARY KEY(diff_phot_id),
+    KEY(diff_id),
+    KEY(state),
+    KEY(label),
+    KEY(data_group),
+    FOREIGN KEY(diff_id) REFERENCES diffRun(diff_id)
+) ENGINE=innodb DEFAULT CHARSET=latin1;
+CREATE TABLE diffPhotSkyfile (
+    diff_phot_id BIGINT AUTO_INCREMENT, -- Identifier for diffPhotRun
+    skycell_id VARCHAR(64) NOT NULL,            -- Skycell identifier
+    path_base VARCHAR(255) NOT NULL, -- Base of path for output
+    dtime_script FLOAT,              -- elapsed time for script
+    hostname VARCHAR(64) NOT NULL,   -- host that executed script
+    fault SMALLINT NOT NULL,         -- fault code
+    quality SMALLINT NOT NULL,       -- bad quality flag
+    software_ver VARCHAR(16),                       -- software version for run
+    PRIMARY KEY(diff_phot_id, skycell_id),
+    KEY(fault),
+    KEY(quality),
+    FOREIGN KEY(diff_phot_id) REFERENCES diffPhotRun(diff_phot_id)
+) ENGINE=innodb DEFAULT CHARSET=latin1;

trunk/dbconfig/ipp.m4

@@ -33 +33 @@
 include(receive.md)
 include(publish.md)
+include(diffphot.md)

trunk/ippTools/share/Makefile.am

@@ -325 +325 @@
      warptool_towarped.sql \
      warptool_updateskyfile.sql \
-     warptool_warped.sql
+     warptool_warped.sql \
+        diffphottool_definerun.sql \
+        diffphottool_input.sql \
+        diffphottool_pending.sql \
+        diffphottool_advance.sql \
+        diffphottool_revert.sql

trunk/ippTools/share/pxadmin_create_tables.sql

@@ -994 +994 @@
         tess_id VARCHAR(64),
         filter VARCHAR(64),
-        software_ver VARCHAR(16),
+        software_ver VARCHAR(16),
         note VARCHAR(255),
         PRIMARY KEY(stack_id),
@@ -1042 +1042 @@
         quality SMALLINT NOT NULL DEFAULT 0,
         fault SMALLINT,
-        software_ver VARCHAR(16),
+        software_ver VARCHAR(16),
         PRIMARY KEY(stack_id),
         KEY(dtime_stack),
@@ -1065 +1065 @@
         exposure TINYINT DEFAULT 0,
         magicked BIGINT,
-        software_ver VARCHAR(16),
+        software_ver VARCHAR(16),
         maskfrac_npix FLOAT,
         maskfrac_static FLOAT,
@@ -1134 +1134 @@
         fault SMALLINT,
         magicked BIGINT,
-        software_ver VARCHAR(16),
-        maskfrac_npix INT,
-        maskfrac_static FLOAT,
-        maskfrac_dynamic FLOAT,
-        maskfrac_magic FLOAT,
+        software_ver VARCHAR(16),
+        maskfrac_npix INT,
+        maskfrac_static FLOAT,
+        maskfrac_dynamic FLOAT,
+        maskfrac_magic FLOAT,
         maskfrac_advisory FLOAT,
         PRIMARY KEY(diff_id, skycell_id),
@@ -1678 +1678 @@
 ) ENGINE=innodb DEFAULT CHARSET=latin1;
 
+
+-- Tables to support (re-)photometry of a diff
+
+CREATE TABLE diffPhotRun (
+    diff_phot_id BIGINT AUTO_INCREMENT, -- Identifier for diffPhotRun
+    diff_id BIGINT NOT NULL,            -- Identifier for diffRun
+    state VARCHAR(64) NOT NULL,         -- State of run
+    workdir VARCHAR(255) NOT NULL, -- working directory
+    label VARCHAR(64),             -- processing label
+    data_group VARCHAR(64),        -- group for data
+    reduction VARCHAR(64),         -- reduction class (for altering recipe)
+    registered TIMESTAMP DEFAULT CURRENT_TIMESTAMP, -- time run was registered
+    note VARCHAR(255),             -- note
+    PRIMARY KEY(diff_phot_id),
+    KEY(diff_id),
+    KEY(state),
+    KEY(label),
+    KEY(data_group),
+    FOREIGN KEY(diff_id) REFERENCES diffRun(diff_id)
+) ENGINE=innodb DEFAULT CHARSET=latin1;
+
+CREATE TABLE diffPhotSkyfile (
+    diff_phot_id BIGINT AUTO_INCREMENT, -- Identifier for diffPhotRun
+    skycell_id VARCHAR(64) NOT NULL,            -- Skycell identifier
+    path_base VARCHAR(255) NOT NULL, -- Base of path for output
+    dtime_script FLOAT,              -- elapsed time for script
+    hostname VARCHAR(64) NOT NULL,   -- host that executed script
+    fault SMALLINT NOT NULL,         -- fault code
+    quality SMALLINT NOT NULL,       -- bad quality flag
+    software_ver VARCHAR(16),                       -- software version
+    PRIMARY KEY(diff_phot_id, skycell_id),
+    KEY(state),
+    KEY(fault),
+    KEY(quality),
+    FOREIGN KEY(diff_phot_id) REFERENCES diffPhotRun(diff_phot_id)
+) ENGINE=innodb DEFAULT CHARSET=latin1;
+
 -- This comment line is here to avoid empty query error.
 -- Another way to avoid that problem is to omit the semicolon above but I think that is untidy.

trunk/ippTools/src

@@ -39 +39 @@
 warptool
 staticskytool
+
+diffphottool

@@ -39 +39 @@
 warptool
 staticskytool
+
+diffphottool

trunk/ippTools/src/Makefile.am

@@ -25 +25 @@
         warptool \
         receivetool \
-        pubtool
+        pubtool \
+        diffphottool
 
 pkginclude_HEADERS = \
@@ -69 +70 @@
         staticskytool.h \
         warptool.h \
-        pubtool.h
+        pubtool.h \
+        diffphottool.h
 
 lib_LTLIBRARIES = libpxtools.la
@@ -264 +266 @@
     pubtoolConfig.c
 
+diffphottool_CFLAGS = $(PSLIB_CFLAGS) $(PSMODULES_CFLAGS) $(IPPDB_CFLAGS)
+diffphottool_LDADD = $(PSLIB_LIBS) $(PSMODULES_LIBS) $(IPPDB_LIBS) libpxtools.la
+diffphottool_SOURCES = \
+    diffphottool.c \
+    diffphottoolConfig.c
+
 clean-local:
         -rm -f TAGS

@@ -39 +39 @@
 warptool
 staticskytool
+
+diffphottool