Changeset 14271

Timestamp:

Jul 17, 2007, 12:05:17 PM (19 years ago)

Author:

jhoblitt

Message:

rework dettool * detselect's handling for registered detrends

Location:

trunk/ippTools

Files:

• scripts/dettest.sh (modified) (1 diff)
• share/detselect_search.sql (modified) (1 diff)
• share/detselect_select.sql (modified) (1 diff)
• src/detselect.c (modified) (1 diff)
• src/dettool.c (modified) (5 diffs)
• src/dettoolConfig.c (modified) (2 diffs)

trunk/ippTools/scripts/dettest.sh

@@ -69 +69 @@
 
 dettool -updatedetrun -det_id $det_id -state stop || exit 1
+
+dettool -register_detrend -det_type bias -mode master -filelevel fpa -workdir file:/// -label foo || exit 1
+dettool -register_detrend_imfile -det_id 2 -class_id 1 -uri file:///foo || exit 1
+dettool -register_detrend_imfile -det_id 2 -class_id 2 -uri file:///foo || exit 1
+dettool -register_detrend_imfile -det_id 2 -class_id 3 -uri file:///foo || exit 1
+dettool -register_detrend_imfile -det_id 2 -class_id 4 -uri file:///foo || exit 1
+dettool -updatedetrun -det_id 2 -state stop || exit 1
+

trunk/ippTools/share/detselect_search.sql

@@ -1 +1 @@
 SELECT DISTINCT
-    detRunSummary.det_id,
-    detRunSummary.iteration,
-    detRun.filelevel
-FROM detRun
-JOIN detRunSummary
-    USING(det_id)
-WHERE
-   detRun.state = 'stop'
-   AND detRun.mode  = 'master'
-   AND detRunSummary.accept = 1
+    det_id,
+    iteration,
+    filelevel
+FROM
+    (SELECT DISTINCT
+        detRun.det_id,
+        detRun.iteration,
+        detRun.filelevel,
+        detRun.registered
+    FROM detRun
+    JOIN detRunSummary
+        USING(det_id)
+    WHERE
+       detRun.state = 'stop'
+       AND detRun.mode  = 'master'
+       AND detRunSummary.accept = 1
+    UNION
+    SELECT DISTINCT
+        detRun.det_id,
+        detRun.iteration,
+        detRun.filelevel,
+        detRun.registered
+    FROM detRun
+    WHERE
+       detRun.state = 'stop'
+       AND detRun.mode  = 'register'
+    ) as Foo

trunk/ippTools/share/detselect_select.sql

@@ -1 +1 @@
 SELECT DISTINCT
-    detNormalizedImfile.*
-FROM detNormalizedImfile
-JOIN detRun
-    USING(det_id)
-JOIN detRunSummary
-    ON detNormalizedImfile.det_id = detRunSummary.det_id
-    AND detNormalizedImfile.iteration = detRunSummary.iteration
-WHERE
-    detRun.state = 'stop'
-    AND detRun.mode  = 'master'
-    AND detRunSummary.accept = 1
+    *
+FROM
+    (SELECT DISTINCT
+        detNormalizedImfile.*
+    FROM detNormalizedImfile
+    JOIN detRun
+        USING(det_id)
+    JOIN detRunSummary
+        ON detNormalizedImfile.det_id = detRunSummary.det_id
+        AND detNormalizedImfile.iteration = detRunSummary.iteration
+    WHERE
+        detRun.state = 'stop'
+        AND detRun.mode  = 'master'
+        AND detRunSummary.accept = 1
+    UNION
+    SELECT DISTINCT
+        detRegisteredImfile.*
+    FROM detRegisteredImfile
+    JOIN detRun
+        USING(det_id)
+    WHERE
+        detRun.state = 'stop'
+        AND detRun.mode  = 'register'
+    ) as Foo

trunk/ippTools/src/detselect.c

@@ -192 +192 @@
     // single detrend image which matches all criteria and has the latest 
     // insertion date
-    psStringAppend(&query, " ORDER BY detRun.registered DESC LIMIT 1");
+    psStringAppend(&query, " ORDER BY registered DESC LIMIT 1");
 
     if (!p_psDBRunQuery(config->dbh, query)) {

trunk/ippTools/src/dettool.c

@@ -6572 +6572 @@
     }
 
-    // everything else is optional
-    psString mode = psMetadataLookupStr(&status, config->args, "-mode");
-    if (!status) {
-        psError(PS_ERR_UNKNOWN, false, "failed to lookup value for -mode");
-        return false;
-    }
-    // check mode
-    if (mode && !isValidMode(config, mode)) {
-        psError(PS_ERR_UNKNOWN, false, "invalud mode");
-        return false;
-    }
-
     psString camera = psMetadataLookupStr(&status, config->args, "-inst");
     if (!status) {
@@ -6743 +6731 @@
     }
 
-    psF64 bg = psMetadataLookupF64(&status, config->args, "-bg");
-    if (!status) {
-        psError(PS_ERR_UNKNOWN, false, "failed to lookup value for -bg");
-        return false;
-    }
-
-    psF64 bg_stdev = psMetadataLookupF64(&status, config->args, "-bg_stdev");
-    if (!status) {
-        psError(PS_ERR_UNKNOWN, false, "failed to lookup value for -bg_stdev");
-        return false;
-    }
-
-    psF64 bg_mean_stdev = psMetadataLookupF64(&status, config->args, "-bg_mean_stdev");
-    if (!status) {
-        psError(PS_ERR_UNKNOWN, false, "failed to lookup value for -bg_mean_stdev");
-        return false;
-    }
-
     psString parent = psMetadataLookupStr(&status, config->args, "-parent");
     if (!status) {
@@ -6779 +6749 @@
 
     if (!detRunInsert(config->dbh,
-                      0,          // det_id
-                      0,          // the iteration is fixed at 0
+                      0,            // det_id
+                      0,            // the iteration is fixed at 0
                       det_type,
-                      mode,
-                      "reg",      // state
+                      "register",   // mode
+                      "register",   // state
                       filelevel,
                       workdir,
@@ -6819 +6789 @@
     psFree(registered);
 
-    if (!detRunSummaryInsert(config->dbh,
-            psDBLastInsertID(config->dbh),
-            0,  // the iteration is fixed at 0
-            bg,
-            bg_stdev,
-            bg_mean_stdev,
-            true,   // accept
-            0       // fault code
-    )) {
-        psError(PS_ERR_UNKNOWN, false, "database error");
-        // rollback
-        if (!psDBRollback(config->dbh)) {
-            psError(PS_ERR_UNKNOWN, false, "database error");
-        }
-        return false;
-    }
-
-    if (!psDBCommit(config->dbh)) {
-        psError(PS_ERR_UNKNOWN, false, "database error");
-        return false;
-    }
-
     // print the new detRun
     psS64 det_id = psDBLastInsertID(config->dbh);
+
+    if (!psDBCommit(config->dbh)) {
+        psError(PS_ERR_UNKNOWN, false, "database error");
+        return false;
+    }
+
     psArray *detRuns = NULL;
     {
@@ -7045 +6999 @@
             || (strncmp(state, "stop", 5) == 0)
             || (strncmp(state, "drop", 5) == 0)
-            || (strncmp(state, "reg", 4) == 0)
+            || (strncmp(state, "register", 4) == 0)
         )
     ) {

trunk/ippTools/src/dettoolConfig.c

@@ -1001 +1001 @@
     psMetadataAddStr(register_detrendArgs, PS_LIST_TAIL, "-use_end",  0,
             "end of detrend run applicable peroid", NULL);
-    psMetadataAddF64(register_detrendArgs, PS_LIST_TAIL, "-bg",  0,
-            "define exposure background", NAN);
-    psMetadataAddF64(register_detrendArgs, PS_LIST_TAIL, "-bg_stdev",  0,
-            "define exposure background stdev", NAN);
-    psMetadataAddF64(register_detrendArgs, PS_LIST_TAIL, "-bg_mean_stdev",  0,
-            "define exposure background mean stdev", NAN);
     psMetadataAddStr(register_detrendArgs, PS_LIST_TAIL, "-parent",  0,
             "define parent det_id", NULL);
+    psMetadataAddStr(register_detrendArgs, PS_LIST_TAIL, "-label",  0,
+            "define detrun label", NULL);
     psMetadataAddBool(register_detrendArgs, PS_LIST_TAIL, "-simple",  0,
             "use the simple output format", false);
@@ -1026 +1022 @@
     psMetadataAddF64(register_detrend_imfileArgs, PS_LIST_TAIL, "-bg_mean_stdev",  0,
             "define exposure background mean stdev", NAN);
+    psMetadataAddF64(register_detrend_imfileArgs, PS_LIST_TAIL, "-user_1",  0,
+            "define user statistic (1)", NAN);
+    psMetadataAddF64(register_detrend_imfileArgs, PS_LIST_TAIL, "-user_2",  0,
+            "define user statistic (2)", NAN);
+    psMetadataAddF64(register_detrend_imfileArgs, PS_LIST_TAIL, "-user_3",  0,
+            "define user statistic (3)", NAN);
+    psMetadataAddF64(register_detrend_imfileArgs, PS_LIST_TAIL, "-user_4",  0,
+            "define user statistic (4)", NAN);
+    psMetadataAddF64(register_detrend_imfileArgs, PS_LIST_TAIL, "-user_5",  0,
+            "define user statistic (5)", NAN);
     psMetadataAddStr(register_detrend_imfileArgs, PS_LIST_TAIL, "-path_base",  0,
             "define base output location", NULL);