Changeset 24512 for trunk/ippTools

Timestamp:

Jun 19, 2009, 12:38:16 PM (17 years ago)

Author:

Paul Price

Message:

Done with development of mechanism to automatically publish detections: merging branches/pap_mops (r24510) into trunk

Location:

trunk

Files:

• . (modified) (1 prop)
• ippTools/doc/publish_flow.txt (copied) (copied from branches/pap_mops/ippTools/doc/publish_flow.txt )
• ippTools/share/Makefile.am (modified) (1 diff)
• ippTools/share/camtool_find_processedexp.sql (modified) (1 diff)
• ippTools/share/chiptool_export_imfile.sql (modified) (1 prop)
• ippTools/share/chiptool_export_processed_imfile.sql (modified) (1 prop)
• ippTools/share/difftool_definewarpstack.sql (modified) (1 prop)
• ippTools/share/difftool_definewarpstack_part1.sql (modified) (1 prop)
• ippTools/share/difftool_definewarpstack_part2.sql (modified) (1 prop)
• ippTools/share/difftool_definewarpstack_temp_create.sql (modified) (1 prop)
• ippTools/share/difftool_skyfile.sql (modified) (2 diffs)
• ippTools/share/pubtool_definerun.sql (copied) (copied from branches/pap_mops/ippTools/share/pubtool_definerun.sql )
• ippTools/share/pubtool_pending.sql (copied) (copied from branches/pap_mops/ippTools/share/pubtool_pending.sql )
• ippTools/share/pubtool_revert.sql (copied) (copied from branches/pap_mops/ippTools/share/pubtool_revert.sql )
• ippTools/share/pxadmin_create_tables.sql (modified) (1 diff)
• ippTools/share/warptool_revertoverlap.sql (modified) (1 prop)
• ippTools/src (modified) (1 prop)
• ippTools/src/Makefile.am (modified) (3 diffs)
• ippTools/src/pubtool.c (copied) (copied from branches/pap_mops/ippTools/src/pubtool.c )
• ippTools/src/pubtool.h (copied) (copied from branches/pap_mops/ippTools/src/pubtool.h )
• ippTools/src/pubtoolConfig.c (copied) (copied from branches/pap_mops/ippTools/src/pubtoolConfig.c )

trunk/ippTools/share/Makefile.am

@@ -168 +168 @@
      pxadmin_create_mirror_tables.sql \
      pxadmin_drop_tables.sql \
+     pubtool_definerun.sql \
+     pubtool_pending.sql \
+     pubtool_revert.sql \
      pztool_find_completed_exp.sql \
      pztool_pendingimfile.sql \

trunk/ippTools/share/camtool_find_processedexp.sql

@@ -5 +5 @@
     rawExp.exp_tag,
     rawExp.exp_name,
+    rawExp.exp_time,
     rawExp.camera,
     rawExp.telescope,

trunk/ippTools/share/difftool_skyfile.sql

@@ -5 +5 @@
     diffRun.state,
     diffRun.workdir,
+    diffRun.bothways,
+    camProcessedExp.zpt_obs,
+    camProcessedExp.zpt_stdev,
+    camProcessedExp.zpt_lq,
+    camProcessedExp.zpt_uq,
+    rawExp.exp_time,
+    rawExp.camera,
     warp1,
     stack1,
@@ -13 +20 @@
 JOIN diffInputSkyfile USING(diff_id, skycell_id)
 JOIN warpRun
+-- NOTE: joining input only!
+-- This is so that we can get the correct zero point
+-- XXX This needs to be more clever to handle diffs between stacks
     ON warpRun.warp_id = diffInputSkyfile.warp1
 JOIN fakeRun USING(fake_id)
 JOIN camRun USING(cam_id)
+JOIN camProcessedExp USING(cam_id)
 JOIN chipRun USING(chip_id)
 JOIN rawExp USING(exp_id)

trunk/ippTools/share/pxadmin_create_tables.sql

@@ -1369 +1369 @@
 
 
+
+-- Tables to support publishing of detections to a Science Client
+
+-- Clients to which we send stuff
+CREATE TABLE publishClient (
+    client_id BIGINT AUTO_INCREMENT, -- unique identifier
+    product VARCHAR(64),             -- product name
+    stage VARCHAR(64) NOT NULL, -- stage of interest (chip, camera, diff, etc.)
+    workdir VARCHAR(255) NOT NULL, -- working directory
+    comment VARCHAR(255),            -- for human memory
+    PRIMARY KEY(client_id)
+) ENGINE=innodb DEFAULT CHARSET=latin1;
+
+-- Publishing a set of data (e.g., a specific diffRun)
+CREATE TABLE publishRun (
+    pub_id BIGINT AUTO_INCREMENT, -- unique identifier
+    client_id BIGINT NOT NULL,  -- link to publishClient
+    stage_id BIGINT NOT NULL,   -- link to various stage tables
+    label VARCHAR(64),          -- label for run
+    state VARCHAR(64),          -- state of run (new, full, etc.)
+    PRIMARY KEY(pub_id),
+    KEY(client_id),
+    KEY(stage_id),
+    KEY(label),
+    KEY(state),
+    FOREIGN KEY(client_id) REFERENCES publishClient(client_id)
+) ENGINE=innodb DEFAULT CHARSET=latin1;
+
+-- Publishing a file within a set
+CREATE TABLE publishDone (
+    pub_id BIGINT AUTO_INCREMENT, -- link to publishRun
+    path_base VARCHAR(255),     -- base path of output
+    fault SMALLINT NOT NULL DEFAULT 0, -- Fault code
+    PRIMARY KEY(pub_id),
+    KEY(fault),
+    FOREIGN KEY(pub_id) REFERENCES publishRun(pub_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

@@ -34 +34 @@
 disttool
 receivetool
+
+pubtool

@@ -34 +34 @@
 disttool
 receivetool
+
+pubtool

trunk/ippTools/src/Makefile.am

@@ -20 +20 @@
         stacktool \
         warptool \
-        receivetool
+        receivetool \
+        pubtool
 
 
@@ -59 +60 @@
         regtool.h \
         stacktool.h \
-        warptool.h
+        warptool.h \
+        pubtool.h
 
 lib_LTLIBRARIES = libpxtools.la
@@ -220 +222 @@
     receivetoolConfig.c
 
+pubtool_CFLAGS = $(PSLIB_CFLAGS) $(PSMODULES_CFLAGS) $(IPPDB_CFLAGS)
+pubtool_LDADD = $(PSLIB_LIBS) $(PSMODULES_LIBS) $(IPPDB_LIBS) libpxtools.la
+pubtool_SOURCES = \
+    pubtool.c \
+    pubtoolConfig.c
+
 clean-local:
         -rm -f TAGS

@@ -34 +34 @@
 disttool
 receivetool
+
+pubtool