Changeset 9494 for trunk/ippTools/src/dettool.c

Timestamp:

Oct 11, 2006, 3:46:56 PM (20 years ago)

Author:

Paul Price

Message:

Add camera for toresidexp.

File:

• trunk/ippTools/src/dettool.c (modified) (9 diffs)

trunk/ippTools/src/dettool.c

@@ -1020 +1020 @@
 {
     PS_ASSERT_PTR_NON_NULL(config, false);
-  
+
     // select detProcessedImfile.det_id
     // select detRun.iteration
@@ -1725 +1725 @@
 
     psString query = psStringCopy(
-        "SELECT" 
+        "SELECT"
         "   det_id,"
         "   det_type,"
@@ -2248 +2248 @@
 {
     PS_ASSERT_PTR_NON_NULL(config, false);
-  
+
     psString query = psStringCopy(
         " SELECT DISTINCT"
@@ -2338 +2338 @@
 {
     PS_ASSERT_PTR_NON_NULL(config, false);
- 
+
     // det_id, recip, -bg, -bg_stdev, & -bg_mean_stdev
     // are required
@@ -2724 +2724 @@
 
     if (config->where) {
-        bool status;
-        int iteration = psMetadataLookupS32 (&status, config->where, "iteration");
-        if (status) {
-            psMetadataRemoveKey (config->where, "iteration");
-            psMetadataAddS32 (config->where, PS_LIST_TAIL, "iteration", 0, "==", iteration);
-        }
+        bool status;
+        int iteration = psMetadataLookupS32 (&status, config->where, "iteration");
+        if (status) {
+            psMetadataRemoveKey (config->where, "iteration");
+            psMetadataAddS32 (config->where, PS_LIST_TAIL, "iteration", 0, "==", iteration);
+        }
         psString whereClause = psDBGenerateWhereConditionSQL(config->where, "detNormalizedImfile");
         psStringAppend(&query, " AND %s", whereClause);
@@ -3126 +3126 @@
         "   det_type,"
         "   exp_tag,"
-        "   include"
+        "   include,"
+        "   camera"
         " FROM"
         "   (SELECT DISTINCT"
@@ -3134 +3135 @@
         "       detInputExp.exp_tag,"
         "       detInputExp.include,"
-        "       rawDetrendExp.imfiles"
+        "       rawDetrendExp.imfiles,"
+        "       rawDetrendExp.camera"
         "   FROM detRun"
         "       LEFT JOIN detInputExp"
@@ -4118 +4120 @@
         " WHERE"
         "   detRun.state = 'run'");
-    
-    // XXX this query was not restricted by det_id, resulting 
+
+    // XXX this query was not restricted by det_id, resulting
     // in an inconsistent UPDATE below.  I added this AND clause
     // though there may be a cleaner method (EAM 2006.10.08)
     psStringAppend (
-        &query,
-        "  AND detRun.det_id = '%s'", det_id);
+        &query,
+        "  AND detRun.det_id = '%s'", det_id);
 
     psStringAppend (
-        &query, 
-        " GROUP BY"
+        &query,
+        " GROUP BY"
         "   detRun.det_id,"
         "   detRun.iteration,"
@@ -4154 +4156 @@
         return true;
     }
-    
+
     // start a transaction so we don't end up with an incremented iteration
     // count but no detInputExps