Changeset 20397

Timestamp:

Oct 25, 2008, 9:12:41 AM (18 years ago)

Author:

eugene

Message:

adding include fields to flatcorrChipLink and flatcorrCamLink

Location:

trunk

Files:

• dbconfig/changes.txt (modified) (1 diff)
• dbconfig/flatcorr.md (modified) (2 diffs)
• ippTools/share/Makefile.am (modified) (1 diff)
• ippTools/share/flatcorr_chiprundone.sql (modified) (1 diff)
• ippTools/share/flatcorr_dropcamera.sql (added)
• ippTools/share/flatcorr_dropchip.sql (added)
• ippTools/share/flatcorr_pendingprocess.sql (modified) (2 diffs)
• ippTools/share/pxadmin_create_tables.sql (modified) (2 diffs)
• ippTools/src/flatcorr.c (modified) (6 diffs)
• ippTools/src/flatcorr.h (modified) (1 diff)
• ippTools/src/flatcorrConfig.c (modified) (3 diffs)

trunk/dbconfig/changes.txt

@@ -678 +678 @@
 
 * 1.1.46
+
 ALTER TABLE pzDownloadImfile ADD COLUMN hostname varchar(64) after epoch;
 ALTER TABLE flatcorrRun ADD COLUMN det_type varchar(64) after corr_id;
-
+ALTER TABLE flatcorrChipLink ADD COLUMN include tinyint after chip_id;
+ALTER TABLE flatcorrCamLink ADD COLUMN include tinyint after cam_id;

trunk/dbconfig/flatcorr.md

@@ -22 +22 @@
     corr_id     S64         0       # Primary Key fkey(corr_id) ref flatcorrRun(corr_id)
     chip_id     S64         0       # Primary Key fkey(chip_id) ref chipRun(chip_id)
+    include     BOOL        t
 END
 
@@ -29 +30 @@
     chip_id     S64         0       # Primary Key fkey(chip_id) ref chipRun(chip_id)
     cam_id      S64         0       # Primary Key fkey(chip_id) ref chipRun(chip_id)
+    include     BOOL        t
 END
 

trunk/ippTools/share/Makefile.am

@@ -95 +95 @@
      flatcorr_pendingprocess.sql \
      flatcorr_inputimfile.sql \
+     flatcorr_dropchip.sql \
+     flatcorr_dropcamera.sql \
      magictool_addmask.sql \
      magictool_create_tmp_warpcomplete.sql \

trunk/ippTools/share/flatcorr_chiprundone.sql

@@ -12 +12 @@
 WHERE
     flatcorrRun.state = 'new'
+    AND flatcorrChipLink.include = 1
     AND chipRun.state = 'full'
     AND camRun.cam_id is NULL;

trunk/ippTools/share/flatcorr_pendingprocess.sql

@@ -20 +20 @@
    JOIN flatcorrChipLink
      ON flatcorrChipLink.corr_id = flatcorrRun.corr_id
+  WHERE flatcorrChipLink.include = 1
    GROUP BY
      flatcorrChipLink.corr_id) AS t1
@@ -30 +31 @@
        ON flatcorrCamLink.cam_id = camRun.cam_id
    WHERE camRun.state = 'full'
+     AND flatcorrCamLink.include = 1
    GROUP BY
        flatcorrCamLink.corr_id) AS t2

trunk/ippTools/share/pxadmin_create_tables.sql

@@ -1100 +1100 @@
         corr_id BIGINT,
         chip_id BIGINT,
+        include TINYINT,
         PRIMARY KEY(corr_id, chip_id),
         FOREIGN KEY (corr_id)  REFERENCES  flatcorrRun(corr_id),
@@ -1109 +1110 @@
         chip_id BIGINT,
         cam_id BIGINT,
+        include TINYINT,
         PRIMARY KEY(corr_id, cam_id),
         FOREIGN KEY (corr_id)  REFERENCES  flatcorrRun(corr_id),

trunk/ippTools/src/flatcorr.c

@@ -39 +39 @@
 static bool addchipMode(pxConfig *config);
 static bool addcameraMode(pxConfig *config);
+static bool dropchipMode(pxConfig *config);
+static bool dropcameraMode(pxConfig *config);
 static bool pendingprocessMode(pxConfig *config);
 static bool addprocessMode(pxConfig *config);
@@ -69 +71 @@
         MODECASE(FLATCORR_MODE_ADDCHIP,        addchipMode);
         MODECASE(FLATCORR_MODE_ADDCAMERA,      addcameraMode);
+        MODECASE(FLATCORR_MODE_DROPCHIP,       dropchipMode);
+        MODECASE(FLATCORR_MODE_DROPCAMERA,     dropcameraMode);
         MODECASE(FLATCORR_MODE_PENDINGPROCESS, pendingprocessMode);
         MODECASE(FLATCORR_MODE_ADDPROCESS,     addprocessMode);
@@ -236 +240 @@
         }
 
-        // add a flatcorrChipLink to the flatcorr Run we just created
-        if (!flatcorrChipLinkInsert(config->dbh, corr_id, chip_id)) {
+        // add a flatcorrChipLink to the flatcorr Run we just created (initial state has include = TRUE)
+        if (!flatcorrChipLinkInsert(config->dbh, corr_id, chip_id, 1)) {
             if (!psDBRollback(config->dbh)) {
                 psError(PS_ERR_UNKNOWN, false, "database error");
@@ -337 +341 @@
     PXOPT_LOOKUP_S64(chip_id, config->args, "-chip_id", true, false);
 
-    if (!flatcorrChipLinkInsert(config->dbh, corr_id, chip_id)) {
-        psError(PS_ERR_UNKNOWN, false, "database error");
+    // add a flatcorrChipLink (initial state has include = TRUE)
+    if (!flatcorrChipLinkInsert(config->dbh, corr_id, chip_id, 1)) {
+        psError(PS_ERR_UNKNOWN, false, "database error");
+        return false;
+    }
+
+    return true;
+}
+
+static bool dropchipMode(pxConfig *config)
+{
+    PS_ASSERT_PTR_NON_NULL(config, false);
+
+    // required
+    PXOPT_LOOKUP_S64(corr_id, config->args, "-corr_id", true, false);
+    PXOPT_LOOKUP_S64(chip_id, config->args, "-chip_id", true, false);
+
+    // UPDATE flatcorrChipLink set include = 0 where corr_id = %lld AND chip_id = %lld
+    psString query = pxDataGet("flatcorr_dropchip.sql");
+    if (!query) {
+        psError(PXTOOLS_ERR_DATA, false, "failed to retreive SQL statement");
+        return false;
+    }
+
+    if (!p_psDBRunQuery(config->dbh, query, (long long) corr_id, (long long) chip_id)) {
+        psError(PS_ERR_UNKNOWN, false, "database error");
+        psFree(query);
         return false;
     }
@@ -448 +477 @@
         psS64 cam_id = psDBLastInsertID(config->dbh);
 
-        // add the camRun entry to the flatcorrCamLink table:
-        if (!flatcorrCamLinkInsert(config->dbh, corr_id, row->chip_id, cam_id)) {
+        // add the camRun entry to the flatcorrCamLink table (include is TRUE)
+        if (!flatcorrCamLinkInsert(config->dbh, corr_id, row->chip_id, cam_id, 1)) {
             if (!psDBRollback(config->dbh)) {
                 psError(PS_ERR_UNKNOWN, false, "database error");
@@ -467 +496 @@
 
     return false;
+}
+
+static bool dropcameraMode(pxConfig *config)
+{
+    PS_ASSERT_PTR_NON_NULL(config, false);
+
+    // required
+    PXOPT_LOOKUP_S64(corr_id, config->args, "-corr_id", true, false);
+    PXOPT_LOOKUP_S64(cam_id, config->args, "-cam_id", true, false);
+
+    // UPDATE flatcorrCamLink set include = 0 where corr_id = %lld AND cam_id = %lld
+    psString query = pxDataGet("flatcorr_dropcamera.sql");
+    if (!query) {
+        psError(PXTOOLS_ERR_DATA, false, "failed to retreive SQL statement");
+        return false;
+    }
+
+    if (!p_psDBRunQuery(config->dbh, query, (long long) corr_id, (long long) cam_id)) {
+        psError(PS_ERR_UNKNOWN, false, "database error");
+        psFree(query);
+        return false;
+    }
+
+    return true;
 }
 

trunk/ippTools/src/flatcorr.h

@@ -29 +29 @@
     FLATCORR_MODE_ADDCHIP,
     FLATCORR_MODE_ADDCAMERA,
+    FLATCORR_MODE_DROPCHIP,
+    FLATCORR_MODE_DROPCAMERA,
     FLATCORR_MODE_PENDINGPROCESS,
     FLATCORR_MODE_ADDPROCESS,

trunk/ippTools/src/flatcorrConfig.c

@@ -81 +81 @@
     psMetadataAddS64(addchipArgs, PS_LIST_TAIL, "-chip_id", 0,            "define Chip ID (required)", 0);
 
+    // -dropchip
+    psMetadata *dropchipArgs = psMetadataAlloc();
+    psMetadataAddS64(dropchipArgs, PS_LIST_TAIL, "-corr_id", 0,            "define Flat Correction ID (required)", 0);
+    psMetadataAddS64(dropchipArgs, PS_LIST_TAIL, "-chip_id", 0,            "define Chip ID (required)", 0);
+
     // -addcamera
     psMetadata *addcameraArgs = psMetadataAlloc();
@@ -86 +91 @@
     psMetadataAddBool(addcameraArgs, PS_LIST_TAIL, "-simple",  0, "use the simple output format", false);
     psMetadataAddBool(addcameraArgs, PS_LIST_TAIL, "-pretend", 0, "use the simple output format", false);
+
+    // -dropcamera
+    psMetadata *dropcameraArgs = psMetadataAlloc();
+    psMetadataAddS64(dropcameraArgs, PS_LIST_TAIL, "-corr_id", 0,      "define Flat Correction ID (required)", 0);
+    psMetadataAddS64(dropcameraArgs, PS_LIST_TAIL, "-cam_id", 0,       "define Camera ID (required)", 0);
 
     // -pendingprocess
@@ -124 +134 @@
     PXOPT_ADD_MODE("-addchip",        "add a chip to a flat correction run",               FLATCORR_MODE_ADDCHIP,        addchipArgs);
     PXOPT_ADD_MODE("-addcamera",      "migrate completed chips to camera stage analysis",  FLATCORR_MODE_ADDCAMERA,      addcameraArgs);
+    PXOPT_ADD_MODE("-dropchip",       "drop a chip from a flat correction run",            FLATCORR_MODE_DROPCHIP,       dropchipArgs);
+    PXOPT_ADD_MODE("-dropcamera",     "drop an exposure (camera stage analysis)",          FLATCORR_MODE_DROPCAMERA,     dropcameraArgs);
     PXOPT_ADD_MODE("-pendingprocess", "show flat correction runs needing to be processed", FLATCORR_MODE_PENDINGPROCESS, pendingprocessArgs);
     PXOPT_ADD_MODE("-addprocess",     "report completed flat correction analysis",         FLATCORR_MODE_ADDPROCESS,     addprocessArgs);