Changeset 24883

Timestamp:

Jul 21, 2009, 2:42:19 PM (17 years ago)

Author:

bills

Message:

Added mode to magictool to censor a magicRun. This is used if unmasked streaks
are found.
This causes any magicDSRuns associated to have the state set to censored
and any de-streaked files to be queued for reverting.

Location:

trunk/ippTools

Files:

• share/Makefile.am (modified) (1 diff)
• share/magicdstool_torevert_camera.sql (modified) (1 diff)
• share/magicdstool_torevert_chip.sql (modified) (1 diff)
• share/magicdstool_torevert_diff.sql (modified) (1 diff)
• share/magicdstool_torevert_raw.sql (modified) (1 diff)
• share/magicdstool_torevert_warp.sql (modified) (1 diff)
• share/magictool_censor_camera.sql (added)
• share/magictool_censor_chip.sql (added)
• share/magictool_censor_diff.sql (added)
• share/magictool_censor_raw.sql (added)
• share/magictool_censor_warp.sql (added)
• src/magictool.c (modified) (3 diffs)
• src/magictool.h (modified) (1 diff)
• src/magictoolConfig.c (modified) (2 diffs)

trunk/ippTools/share/Makefile.am

@@ -137 +137 @@
      flatcorr_dropcamera.sql \
      magictool_addmask.sql \
+     magictool_censor_raw.sql \
+     magictool_censor_chip.sql \
+     magictool_censor_camera.sql \
+     magictool_censor_warp.sql \
+     magictool_censor_diff.sql \
      magictool_create_tmp_warpcomplete.sql \
      magictool_definebyquery_insert.sql \

trunk/ippTools/share/magicdstool_torevert_camera.sql

@@ -19 +19 @@
     JOIN rawExp using(exp_id)
 WHERE magicDSRun.stage = 'camera'
-    AND magicDSRun.state = 'new'
+    AND (magicDSRun.state = 'new' OR magicDSRun.state = 'censored')
     AND magicDSFile.fault > 0

trunk/ippTools/share/magicdstool_torevert_chip.sql

@@ -18 +18 @@
     JOIN rawExp using(exp_id)
 WHERE magicDSRun.stage = 'chip'
-    AND magicDSRun.state = 'new'
+    AND (magicDSRun.state = 'new' OR magicDSRun.state = 'censored')
     AND magicDSFile.fault > 0

trunk/ippTools/share/magicdstool_torevert_diff.sql

@@ -18 +18 @@
     JOIN rawExp USING(exp_id)
 WHERE magicDSRun.stage = 'diff'
-    AND magicDSRun.state = 'new'
+    AND (magicDSRun.state = 'new' OR magicDSRun.state = 'censored')
     AND magicDSFile.fault > 0

trunk/ippTools/share/magicdstool_torevert_raw.sql

@@ -18 +18 @@
                       AND rawImfile.tmp_class_id = summitImfile.class_id)
 WHERE magicDSRun.stage = 'raw'
-    AND magicDSRun.state = 'new'
+    AND (magicDSRun.state = 'new' OR magicDSRun.state = 'censored')
     AND magicDSFile.fault > 0

trunk/ippTools/share/magicdstool_torevert_warp.sql

@@ -21 +21 @@
     JOIN rawExp USING(exp_id)
 WHERE magicDSRun.stage = 'warp'
-    AND magicDSRun.state = 'new'
+    AND (magicDSRun.state = 'new' OR magicDSRun.state = 'censored')
     AND magicDSFile.fault > 0

trunk/ippTools/src/magictool.c

@@ -47 +47 @@
 static bool revertmaskMode(pxConfig *config);
 static bool maskMode(pxConfig *config);
+static bool censorrunMode(pxConfig *config);
 
 static bool setmagicRunState(pxConfig *config, psS64 magic_id, const char *state);
@@ -85 +86 @@
         MODECASE(MAGICTOOL_MODE_REVERTMASK,          revertmaskMode);
         MODECASE(MAGICTOOL_MODE_MASK,                maskMode);
+        MODECASE(MAGICTOOL_MODE_CENSORRUN,           censorrunMode);
         default:
             psAbort("invalid option (this should not happen)");
@@ -1367 +1369 @@
     return true;
 }
+
+static bool censorStage(pxConfig *config, psString stage, psString whereClause)
+{
+    psString queryFile = NULL;
+    psStringAppend(&queryFile, "magicdstool_censor_%s.sql", stage);
+    psString query = pxDataGet(queryFile);
+    if (!query) {
+        psError(PXTOOLS_ERR_DATA, false, "failed to retreive SQL statement from %s", queryFile);
+        psFree(queryFile);
+        if (!psDBRollback(config->dbh)) {
+            psError(PS_ERR_UNKNOWN, false, "database error");
+        }
+        return false;
+    }
+    psFree(queryFile);
+
+    psStringAppend(&query, whereClause);
+
+    if (!p_psDBRunQuery(config->dbh, query)) {
+        psError(PS_ERR_UNKNOWN, false, "database error");
+        psFree(query);
+        if (!psDBRollback(config->dbh)) {
+            psError(PS_ERR_UNKNOWN, false, "database error");
+        }
+        return false;
+    }
+    psFree(query);
+
+    return true;
+}
+
+static bool censorrunMode(pxConfig *config)
+{
+    PS_ASSERT_PTR_NON_NULL(config, false);
+
+    psMetadata *where = psMetadataAlloc();
+
+    // at least one of these required
+    PXOPT_COPY_S64(config->args, where, "-magic_id", "magic_id", "==");
+    PXOPT_COPY_S64(config->args, where, "-exp_id", "exp_id", "==");
+
+    if (!psListLength(where->list)) {
+        psError(PS_ERR_UNKNOWN, true, "either -exp_id or -magic_id is required");
+        psFree(where);
+        return false;
+    }
+
+    psString query = psStringCopy("UPDATE magicRun SET state = 'censored'");
+
+    psString whereClause = psDBGenerateWhereConditionSQL(where, "magicRun");
+    psFree(where);
+    psStringAppend(&query, " WHERE %s", whereClause);
+
+    if (!psDBTransaction(config->dbh)) {
+        psError(PS_ERR_UNKNOWN, false, "database error");
+        return false;
+    }
+
+    if (!p_psDBRunQuery(config->dbh, query)) {
+        psError(PS_ERR_UNKNOWN, false, "database error");
+        psFree(whereClause);
+        psFree(query);
+        return false;
+    }
+    psFree(query);
+
+    // Now queue any destreaked files to be re-verted
+
+    // note: on failure censorStage issues the rollback
+    if (!censorStage(config, "raw", whereClause)) {
+        psFree(whereClause);
+        return false;
+    }
+    if (!censorStage(config, "chip", whereClause)) {
+        psFree(whereClause);
+        return false;
+    }
+    if (!censorStage(config, "camera", whereClause)) {
+        psFree(whereClause);
+        return false;
+    }
+    if (!censorStage(config, "warp", whereClause)) {
+        psFree(whereClause);
+        return false;
+    }
+    if (!censorStage(config, "diff", whereClause)) {
+        psFree(whereClause);
+        return false;
+    }
+
+    psFree(whereClause);
+
+    if (!psDBCommit(config->dbh)) {
+        psError(PS_ERR_UNKNOWN, false, "database error");
+        return false;
+    }
+
+    return true;
+}

trunk/ippTools/src/magictool.h

@@ -41 +41 @@
     MAGICTOOL_MODE_REVERTMASK,
     MAGICTOOL_MODE_MASK,
-    MAGICTOOL_MODE_DIFFSKYFILE,
-    MAGICTOOL_MODE_WARPSKYFILE,
-    MAGICTOOL_MODE_CHIPPROCESSEDIMFILE,
-    MAGICTOOL_MODE_RAWIMFILE,
+    MAGICTOOL_MODE_CENSORRUN,
 } MAGICtoolMode;
 

trunk/ippTools/src/magictoolConfig.c

@@ -160 +160 @@
     psMetadataAddBool(maskArgs, PS_LIST_TAIL, "-simple", 0, "use the simple output format", false);
 
-#ifdef notdef
-    // -diffskyfile
-    psMetadata *diffskyfileArgs = psMetadataAlloc();
-    psMetadataAddS64(diffskyfileArgs, PS_LIST_TAIL, "-magic_id", 0, "define magictool ID (required)", 0);
-    psMetadataAddStr(diffskyfileArgs, PS_LIST_TAIL, "-class_id", 0, "define class identifier", NULL);
-    psMetadataAddStr(diffskyfileArgs, PS_LIST_TAIL, "-skycell_id", 0, "define skycell identifier", NULL);
-    psMetadataAddBool(diffskyfileArgs, PS_LIST_TAIL, "-simple", 0, "use the simple output format", false);
-
-    // -warpskyfile
-    psMetadata *warpskyfileArgs = psMetadataAlloc();
-    psMetadataAddS64(warpskyfileArgs, PS_LIST_TAIL, "-magic_id", 0, "define magictool ID (required)", 0);
-    psMetadataAddBool(warpskyfileArgs, PS_LIST_TAIL, "-simple", 0, "use the simple output format", false);
-    psMetadataAddStr(warpskyfileArgs, PS_LIST_TAIL, "-skycell_id", 0, "define skycell identifier", NULL);
-
-    // -chipprocessedimfile
-    psMetadata *chipprocessedimfileArgs = psMetadataAlloc();
-    psMetadataAddS64(chipprocessedimfileArgs, PS_LIST_TAIL, "-magic_id", 0, "define magictool ID (required)", 0);
-    psMetadataAddStr(chipprocessedimfileArgs, PS_LIST_TAIL, "-class_id", 0, "define class identifier", NULL);
-    psMetadataAddBool(chipprocessedimfileArgs, PS_LIST_TAIL, "-simple", 0, "use the simple output format", false);
-
-    // -rawimfile
-    psMetadata *rawimfileArgs = psMetadataAlloc();
-    psMetadataAddS64(rawimfileArgs, PS_LIST_TAIL, "-magic_id", 0, "define magictool ID (required)", 0);
-    psMetadataAddStr(rawimfileArgs, PS_LIST_TAIL, "-class_id", 0, "define class identifier", NULL);
-    psMetadataAddBool(rawimfileArgs, PS_LIST_TAIL, "-simple", 0, "use the simple output format", false);
-#endif // notdef
+    // -censorun
+    psMetadata *censorrunArgs = psMetadataAlloc();
+    psMetadataAddS64(censorrunArgs, PS_LIST_TAIL, "-magic_id", 0, "define magictool ID", 0);
+    psMetadataAddS64(censorrunArgs, PS_LIST_TAIL, "-exp_id", 0, "define exposure ID", 0);
 
     psFree(now);
@@ -208 +186 @@
     PXOPT_ADD_MODE("-revertmask",          "", MAGICTOOL_MODE_REVERTMASK,          revertmaskArgs);
     PXOPT_ADD_MODE("-mask",                "", MAGICTOOL_MODE_MASK,                maskArgs);
-#ifdef notdef
-    PXOPT_ADD_MODE("-diffskyfile",         "", MAGICTOOL_MODE_DIFFSKYFILE,         diffskyfileArgs);
-    PXOPT_ADD_MODE("-warpskyfile",         "", MAGICTOOL_MODE_WARPSKYFILE,         warpskyfileArgs);
-    PXOPT_ADD_MODE("-chipprocessedimfile", "", MAGICTOOL_MODE_CHIPPROCESSEDIMFILE, chipprocessedimfileArgs);
-    PXOPT_ADD_MODE("-rawimfile",           "", MAGICTOOL_MODE_RAWIMFILE,           rawimfileArgs);
-#endif
+    PXOPT_ADD_MODE("-censorrun",           "", MAGICTOOL_MODE_CENSORRUN,           censorrunArgs);
 
     if (!pxGetOptions(stderr, argc, argv, config, modes, argSets)) {