Changeset 25784 for trunk/ippTools/src/flatcorr.c

Timestamp:

Oct 6, 2009, 9:22:42 AM (17 years ago)

Author:

eugene

Message:

change addcamera to advancecamera; add addcamera mode matching addchip mode

File:

• trunk/ippTools/src/flatcorr.c (modified) (5 diffs)

trunk/ippTools/src/flatcorr.c

@@ -39 +39 @@
 static bool addchipMode(pxConfig *config);
 static bool addcameraMode(pxConfig *config);
+static bool advancecameraMode(pxConfig *config);
 static bool dropchipMode(pxConfig *config);
 static bool dropcameraMode(pxConfig *config);
@@ -73 +74 @@
         MODECASE(FLATCORR_MODE_ADDCHIP,        addchipMode);
         MODECASE(FLATCORR_MODE_ADDCAMERA,      addcameraMode);
+        MODECASE(FLATCORR_MODE_ADVANCECAMERA,  advancecameraMode);
         MODECASE(FLATCORR_MODE_DROPCHIP,       dropchipMode);
         MODECASE(FLATCORR_MODE_DROPCAMERA,     dropcameraMode);
@@ -297 +299 @@
     // start a transaction so we don't end up with an exp without any associted
     // imfiles
-    if (!psDBTransaction(config->dbh)) {
-        psError(PS_ERR_UNKNOWN, false, "database error");
-        return false;
-    }
+    // if (!psDBTransaction(config->dbh)) {
+    //     psError(PS_ERR_UNKNOWN, false, "database error");
+    //     return false;
+    // }
 
     // create a new flatcorrRun
@@ -333 +335 @@
     row->corr_id = corr_id;
 
+    // if (!psDBCommit(config->dbh)) {
+    //     psError(PS_ERR_UNKNOWN, false, "database error");
+    //     return false;
+    // }
+
     flatcorrRunPrintObject (stdout, row, !simple);
     return true;
@@ -378 +385 @@
 }
 
+static bool addcameraMode(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);
+    PXOPT_LOOKUP_S64(cam_id, config->args, "-cam_id", true, false);
+
+    // add a flatcorrCamLink (initial state has include = TRUE)
+    // XXX should add checks that the chip_id and corr_id are in ChipLink
+    if (!flatcorrCamLinkInsert(config->dbh, corr_id, chip_id, cam_id, 1)) {
+        psError(PS_ERR_UNKNOWN, false, "database error");
+        return false;
+    }
+
+    return true;
+}
+
 // select the flatcorr chip runs that have completed and for which there is no camera entry
 // queue a new camera run for them
-static bool addcameraMode(pxConfig *config)
+static bool advancecameraMode(pxConfig *config)
 {
     PS_ASSERT_PTR_NON_NULL(config, false);