Changeset 20976

Timestamp:

Dec 13, 2008, 11:48:02 AM (17 years ago)

Author:

bills

Message:

tweaks for stack vesrus stack diffs (where exp_id is NULL)

Location:

trunk/ippTools

Files:

• share/difftool_inputskyfile.sql (modified) (4 diffs)
• src/difftool.c (modified) (1 diff)
• src/difftoolConfig.c (modified) (1 diff)

trunk/ippTools/share/difftool_inputskyfile.sql

@@ -47 +47 @@
         warpSkyfile.uri,
         warpSkyfile.path_base,
-        0 as template,
+        1 as template,
         rawExp.camera
     FROM diffRun
@@ -85 +85 @@
         stackSumSkyfile.uri,
         stackSumSkyfile.path_base,
-        1 as template,
+        0 as template,
         rawExp.camera
     FROM diffRun
@@ -92 +92 @@
     JOIN stackSumSkyfile
         ON  diffInputSkyfile.stack1 = stackSumSkyfile.stack_id
+    JOIN stackInputSkyfile
+        ON diffInputSkyfile.stack1 = stackInputSkyfile.stack_id
+    JOIN warpRun
+        ON stackInputSkyfile.warp_id = warpRun.warp_id
+    JOIN fakeRun
+        USING(fake_id)
+    JOIN camRun
+        USING(cam_id)
+    JOIN chipRun
+        USING(chip_id)
     JOIN rawExp
-        USING(exp_id)
+        ON chipRun.exp_id = rawExp.exp_id
     WHERE
         diffRun.state = 'new'
@@ -114 +124 @@
     JOIN stackSumSkyfile
         ON  diffInputSkyfile.stack2 = stackSumSkyfile.stack_id
+    JOIN stackInputSkyfile
+        ON diffInputSkyfile.stack2 = stackInputSkyfile.stack_id
+    JOIN warpRun
+        ON stackInputSkyfile.warp_id = warpRun.warp_id
+    JOIN fakeRun
+        USING(fake_id)
+    JOIN camRun
+        USING(cam_id)
+    JOIN chipRun
+        USING(chip_id)
     JOIN rawExp
-        USING(exp_id)
+        ON chipRun.exp_id = rawExp.exp_id
     WHERE
         diffRun.state = 'new'

trunk/ippTools/src/difftool.c

@@ -916 +916 @@
                       template_warp_id ? template_warp_id : PS_MAX_S64,
                       template_stack_id ? template_stack_id : PS_MAX_S64,
-                      exp_id,
+                      exp_id ? exp_id : PS_MAX_S64,
                       config)) {
         psError(PS_ERR_UNKNOWN, false, "failed to create populated diffRun");

trunk/ippTools/src/difftoolConfig.c

@@ -138 +138 @@
     psMetadataAddStr(definepoprunArgs, PS_LIST_TAIL, "-reduction",  0,            "define reduction class", NULL);
     psMetadataAddBool(definepoprunArgs, PS_LIST_TAIL, "-simple",  0,            "use the simple output format", false);
+    psMetadataAddS64(definepoprunArgs, PS_LIST_TAIL, "-exp_id", 0,              "define exposure ID for template", 0);
     psMetadataAddS64(definepoprunArgs, PS_LIST_TAIL, "-template_warp_id", 0,            "define warp ID for template", 0);
     psMetadataAddS64(definepoprunArgs, PS_LIST_TAIL, "-template_stack_id", 0,            "define stack ID for template", 0);