Changeset 31435 for trunk/ippTools

Timestamp:

May 4, 2011, 3:59:42 PM (15 years ago)

Author:

watersc1

Message:

LAP code, quick stacking code, and unconvolved diff code.

Location:

trunk/ippTools

Files:

• share/Makefile.am (modified) (1 diff)
• share/laptool_definerun.sql (copied) (copied from branches/czw_branch/20110406/ippTools/share/laptool_definerun.sql )
• share/laptool_exposures.sql (copied) (copied from branches/czw_branch/20110406/ippTools/share/laptool_exposures.sql )
• share/laptool_inactiveexp.sql (copied) (copied from branches/czw_branch/20110406/ippTools/share/laptool_inactiveexp.sql )
• share/laptool_listsequence.sql (copied) (copied from branches/czw_branch/20110406/ippTools/share/laptool_listsequence.sql )
• share/laptool_pendingchipexp.sql (copied) (copied from branches/czw_branch/20110406/ippTools/share/laptool_pendingchipexp.sql )
• share/laptool_pendingexp.sql (copied) (copied from branches/czw_branch/20110406/ippTools/share/laptool_pendingexp.sql )
• share/laptool_pendingrun.sql (copied) (copied from branches/czw_branch/20110406/ippTools/share/laptool_pendingrun.sql )
• share/laptool_stacks.sql (copied) (copied from branches/czw_branch/20110406/ippTools/share/laptool_stacks.sql )
• share/pxadmin_create_tables.sql (modified) (1 diff, 1 prop)
• share/stacktool_sassskyfile.sql (modified) (1 diff)
• src (modified) (2 props)
• src/Makefile.am (modified) (3 diffs)
• src/difftool.c (modified) (1 diff)
• src/difftoolConfig.c (modified) (1 diff)
• src/laptool.c (copied) (copied from branches/czw_branch/20110406/ippTools/src/laptool.c )
• src/laptool.h (copied) (copied from branches/czw_branch/20110406/ippTools/src/laptool.h )
• src/laptoolConfig.c (copied) (copied from branches/czw_branch/20110406/ippTools/src/laptoolConfig.c )
• src/magictool.c (modified) (1 prop)

trunk/ippTools/share/Makefile.am

@@ -414 +414 @@
         diffphottool_advance.sql \
         diffphottool_revert.sql \
-        diffphottool_data.sql
+        diffphottool_data.sql \
+        laptool_definerun.sql \
+        laptool_exposures.sql \
+        laptool_inactiveexp.sql \ 
+        laptool_listsequence.sql \
+        laptool_pendingchipexp.sql \
+        laptool_pendingexp.sql \
+        laptool_pendingrun.sql \
+        laptool_stacks.sql
+

trunk/ippTools/share/pxadmin_create_tables.sql

@@ -1891 +1891 @@
 ) ENGINE=innodb DEFAULT CHARSET=latin1;
 
+-- Tables for large area processing
+
+CREATE TABLE lapSequence (
+    seq_id BIGINT AUTO_INCREMENT, -- Identifier for the processing sequence
+    name VARCHAR(64) NOT NULL,    -- short name of the sequence
+    description VARCHAR(255) NOT NULL, -- longer description of the sequence
+    PRIMARY KEY(seq_id),
+    KEY(name)
+) ENGINE=innodb DEFAULT CHARSET=latin1;
+
+CREATE TABLE lapRun (
+    lap_id BIGINT AUTO_INCREMENT, -- Identifier for the processing run
+    seq_id BIGINT NOT NULL,       -- Identifier to match to the sequence
+    tess_id VARCHAR(64) NOT NULL, -- tessellation id to use
+    projection_cell VARCHAR(64) NOT NULL, -- projection cell from the tessellation to consider
+    filter VARCHAR(64) NOT NULL,  -- filter
+    state VARCHAR(64) NOT NULL,   -- state of run
+    label VARCHAR(64) NOT NULL,   -- processing label
+    dist_group VARCHAR(64) NOT NULL, -- distribution group for products of this run
+    registered TIMESTAMP DEFAULT CURRENT_TIMESTAMP, -- time run was registered
+    fault SMALLINT NOT NULL,      -- fault code
+    quick_sass_id BIGINT,         -- stackAssociation id for quick stack
+    final_sass_id BIGINT,         -- stackAssociation id for final stack
+    PRIMARY KEY(lap_id),
+    KEY(seq_id),
+    KEY(projection_cell),
+    KEY(filter),
+    KEY(state),
+    KEY(label),
+    KEY(fault),
+    FOREIGN KEY(seq_id) REFERENCES lapSequence(seq_id),
+    FOREIGN KEY(quick_sass_id) REFERENCES stackAssociation(sass_id),
+    FOREIGN KEY(final_sass_id) REFERENCES stackAssociation(sass_id)
+) ENGINE=innodb DEFAULT CHARSET=latin1;
+
+CREATE TABLE lapExp (
+    lap_id BIGINT NOT NULL, -- Link back to processing run
+    exp_id BIGINT NOT NULL, -- exposure definition
+    chip_id BIGINT,         -- processing id from chipRun
+    pair_id BIGINT,         -- companion chip_id
+    private TINYINT DEFAULT 0, -- denotes this exposure is private
+    pairwise TINYINT DEFAULT 0, -- denotes if this exposure should be pairwise diffed
+    active TINYINT DEFAULT 0, -- denotes if this exposure is currently in use
+    data_state VARCHAR(64) NOT NULL, -- state of exposure
+    PRIMARY KEY (lap_id),
+    KEY (exp_id),
+    KEY (chip_id),
+    KEY (pair_id),
+    KEY (data_state),
+    FOREIGN KEY (lap_id) REFERENCES lapRun(lap_id),
+    FOREIGN KEY (exp_id) REFERENCES rawExp(exp_id),
+    FOREIGN KEY (chip_id,exp_id) REFERENCES chipRun(chip_id,exp_id),
+    FOREIGN KEY (pair_id) REFERENCES chipRun(chip_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/share/stacktool_sassskyfile.sql

@@ -18 +18 @@
         where stack_id = stackRun.stack_id limit 1
     ) as camera
-FROM stackRun
-JOIN stackSumSkyfile USING(stack_id)
-JOIN stackAssociationMap USING(stack_id)
-JOIN stackAssociation USING(sass_id)
+FROM stackAssociation
+JOIN stackAssociationMap USING(sass_id)
+JOIN stackRun USING(stack_id)
+LEFT JOIN stackSumSkyfile USING(stack_id)

trunk/ippTools/src

@@ -42 +42 @@
 diffphottool
 minidvodbtool
+laptool

@@ -42 +42 @@
 diffphottool
 minidvodbtool
+laptool

trunk/ippTools/src/Makefile.am

@@ -28 +28 @@
         pubtool \
         diffphottool \
-        minidvodbtool
+        minidvodbtool \
+        laptool
 
 pkginclude_HEADERS = \
@@ -76 +77 @@
         pubtool.h \
         diffphottool.h \
-        minidvodbtool.h
+        minidvodbtool.h \
+        laptool.h
 
 lib_LTLIBRARIES = libpxtools.la
@@ -290 +292 @@
     minidvodbtoolConfig.c
 
+laptool_CFLAGS = $(PSLIB_CFLAGS) $(PSMODULES_CFLAGS) $(IPPDB_CFLAGS)
+laptool_LDADD = $(PSLIB_LIBS) $(PSMODULES_LIBS) $(IPPDB_LIBS) libpxtools.la
+laptool_SOURCES = \
+    laptool.c \
+    laptoolConfig.c
+
 clean-local:
         -rm -f TAGS

trunk/ippTools/src/difftool.c

@@ -1625 +1625 @@
     PXOPT_COPY_S64(config->args, selectWhere, "-exp_id", "inputRawExp.exp_id", "==");
     PXOPT_COPY_S64(config->args, selectWhere, "-template_exp_id", "templateRawExp.exp_id", "==");
+    PXOPT_COPY_S64(config->args, selectWhere, "-template_warp_id", "templateWarpRun.warp_id", "==");
     PXOPT_COPY_STR(config->args, selectWhere, "-filter", "inputRawExp.filter", "==");
     PXOPT_COPY_STR(config->args, selectWhere, "-obs_mode", "inputRawExp.obs_mode", "==");

trunk/ippTools/src/difftoolConfig.c

@@ -278 +278 @@
     psMetadataAddBool(definewarpwarpArgs, PS_LIST_TAIL, "-not-bothways",  0, "only do the single-direction subtraction?", false);
     psMetadataAddS64(definewarpwarpArgs, PS_LIST_TAIL,  "-template_exp_id",  0,  "search by template exposure ID", 0);
+    psMetadataAddS64(definewarpwarpArgs, PS_LIST_TAIL,  "-template_warp_id",  0,  "search by template warp ID", 0);
     psMetadataAddStr(definewarpwarpArgs, PS_LIST_TAIL, "-filter", 0, "search by filter", NULL);
     psMetadataAddF32(definewarpwarpArgs, PS_LIST_TAIL, "-distance", 0, "limit distance between input and template (deg)", NAN);

@@ -42 +42 @@
 diffphottool
 minidvodbtool
+laptool