Changeset 15830

Timestamp:

Dec 14, 2007, 2:30:36 PM (18 years ago)

Author:

jhoblitt

Message:

implement dettool -addcorrectimfile

Location:

trunk/ippTools

Files:

• share/Makefile.am (modified) (1 diff)
• share/dettool_find_completed_correct_runs.sql (deleted)
• share/dettool_stop_completed_correct_runs.sql (added)
• src/dettool.c (modified) (3 diffs)
• src/dettool.h (modified) (2 diffs)
• src/dettoolConfig.c (modified) (2 diffs)
• src/dettool_correction.c (modified) (1 diff)

trunk/ippTools/share/Makefile.am

@@ -15 +15 @@
         dettool_tocorrectimfile.sql \
         dettool_tocorrectexp.sql \
-        dettool_find_completed_correct_runs.sql
+        dettool_stop_completed_correct_runs.sql \
         dettool_find_completed_runs.sql \
         dettool_normalizedstat.sql \

trunk/ippTools/src/dettool.c

@@ -91 +91 @@
 // register
 static bool register_detrendMode(pxConfig *config);
-static bool register_detrend_imfileMode(pxConfig *config);
 
 static detNormalizedStatImfileRow *detStackedToDetNormalizedStatImfile(pxConfig *config, detStackedImfileRow *stackedImfile);
@@ -135 +134 @@
         MODECASE(DETTOOL_MODE_TOCORRECTEXP,      tocorrectexpMode);
         MODECASE(DETTOOL_MODE_TOCORRECTIMFILE,   tocorrectimfileMode);
+        MODECASE(DETTOOL_MODE_ADDCORRECTIMFILE,  addcorrectimfileMode);
         // imfile
         MODECASE(DETTOOL_MODE_TOPROCESSEDIMFILE,toprocessedimfileMode);
@@ -6739 +6739 @@
 }
 
-static bool register_detrend_imfileMode(pxConfig *config)
+bool register_detrend_imfileMode(pxConfig *config)
 {
     PS_ASSERT_PTR_NON_NULL(config, false);

trunk/ippTools/src/dettool.h

@@ -32 +32 @@
     DETTOOL_MODE_TOCORRECTEXP,
     DETTOOL_MODE_TOCORRECTIMFILE,
+    DETTOOL_MODE_ADDCORRECTIMFILE,
     DETTOOL_MODE_RUNS,
     DETTOOL_MODE_CHILDLESSRUN,
@@ -81 +82 @@
 pxConfig *dettoolConfig(pxConfig *config, int argc, char **argv);
 
+// correct
 bool makecorrectionMode(pxConfig *config);
 bool tocorrectexpMode(pxConfig *config);
 bool tocorrectimfileMode(pxConfig *config);
+bool addcorrectimfileMode(pxConfig *config);
+// register
+bool register_detrend_imfileMode(pxConfig *config);
 
 #endif // DETTOOL_H

trunk/ippTools/src/dettoolConfig.c

@@ -293 +293 @@
             "use the simple output format", false);
 
+    // -addcorrectimfile
+    psMetadata *addcorrectimfileArgs = psMetadataAlloc();
+    psMetadataAddStr(addcorrectimfileArgs, PS_LIST_TAIL, "-det_id",  0,
+            "define detrend ID (required)", NULL);
+    psMetadataAddStr(addcorrectimfileArgs, PS_LIST_TAIL, "-class_id",  0,
+            "search for class ID (required)", NULL);
+    psMetadataAddStr(addcorrectimfileArgs, PS_LIST_TAIL, "-uri",  0,
+            "define resid file URI (required)", NULL);
+    psMetadataAddF64(addcorrectimfileArgs, PS_LIST_TAIL, "-bg",  0,
+            "define exposure background", NAN);
+    psMetadataAddF64(addcorrectimfileArgs, PS_LIST_TAIL, "-bg_stdev",  0,
+            "define exposure background stdev", NAN);
+    psMetadataAddF64(addcorrectimfileArgs, PS_LIST_TAIL, "-bg_mean_stdev",  0,
+            "define exposure background mean stdev", NAN);
+    psMetadataAddF64(addcorrectimfileArgs, PS_LIST_TAIL, "-user_1",  0,
+            "define user statistic (1)", NAN);
+    psMetadataAddF64(addcorrectimfileArgs, PS_LIST_TAIL, "-user_2",  0,
+            "define user statistic (2)", NAN);
+    psMetadataAddF64(addcorrectimfileArgs, PS_LIST_TAIL, "-user_3",  0,
+            "define user statistic (3)", NAN);
+    psMetadataAddF64(addcorrectimfileArgs, PS_LIST_TAIL, "-user_4",  0,
+            "define user statistic (4)", NAN);
+    psMetadataAddF64(addcorrectimfileArgs, PS_LIST_TAIL, "-user_5",  0,
+            "define user statistic (5)", NAN);
+    psMetadataAddStr(addcorrectimfileArgs, PS_LIST_TAIL, "-path_base",  0,
+            "define base output location", NULL);
+
     // -runs
     psMetadata *runsArgs = psMetadataAlloc();
@@ -1090 +1117 @@
     PXTOOL_ADD_MODE("-tocorrectexp",    "", DETTOOL_MODE_TOCORRECTEXP, tocorrectexpArgs);
     PXTOOL_ADD_MODE("-tocorrectimfile", "", DETTOOL_MODE_TOCORRECTIMFILE, tocorrectimfileArgs);
+    PXTOOL_ADD_MODE("-addcorrectimfile", "", DETTOOL_MODE_ADDCORRECTIMFILE, addcorrectimfileArgs);
     PXTOOL_ADD_MODE("-raw",             "", DETTOOL_MODE_RAW,           rawArgs);
     PXTOOL_ADD_MODE("-runs",            "", DETTOOL_MODE_RUNS,          runsArgs);

trunk/ippTools/src/dettool_correction.c

@@ -280 +280 @@
     return true;
 }
+
+bool addcorrectimfileMode(pxConfig *config)
+{
+    PS_ASSERT_PTR_NON_NULL(config, false);
+
+    // insert the row into detRegisterImfile
+    if (!register_detrend_imfileMode(config)) {
+        return false;
+    }
+    
+    // automatically stop completed 'correct' detRuns
+    psString query = pxDataGet("dettool_stop_completed_correct_runs.sql");
+    if (!query) {
+        psError(PXTOOLS_ERR_DATA, false, "failed to retreive SQL statement");
+        return false;
+    }
+
+    if (!p_psDBRunQuery(config->dbh, query)) {
+        psError(PS_ERR_UNKNOWN, false, "database error");
+        psFree(query);
+        return false;
+    }
+    psFree(query);
+
+    return true;
+}