Changeset 29902 for trunk/ippTools/src/chiptool.c

Timestamp:

Dec 2, 2010, 3:10:33 PM (15 years ago)

Author:

bills

Message:

Save results of detection efficiency analaysis is the database.
resolve pxadmin_create_tables.sql with dbconfig and changes to the gpc1 database

Location:

trunk/ippTools/src

Files:

• . (modified) (1 prop)
• chiptool.c (modified) (3 diffs)

trunk/ippTools/src/chiptool.c

@@ -601 +601 @@
     PXOPT_LOOKUP_F32(maskfrac_magic, config->args, "-maskfrac_magic", false, false);
     PXOPT_LOOKUP_F32(maskfrac_advisory, config->args, "-maskfrac_advisory", false, false);
+    PXOPT_LOOKUP_F32(deteff_magref, config->args, "-deteff_magref", false, false);
 
     psTrace("czw.test",1,"Received versions: pslib %s psmodules %s psphot %s psastro %s ppstats %s ppImage %s streaks %s\n",
@@ -706 +707 @@
                                    maskfrac_dynamic,
                                    maskfrac_magic,
-                                   maskfrac_advisory
+                                   maskfrac_advisory,
+                                   deteff_magref
             )) {
         // rollback
@@ -715 +717 @@
         return false;
     }
-
-#if 0
-    // XXX I've decided to make the transaction cover the Exp migration as
-    // well.  Otherwise, if the last imfile in an exp is moved and the exp
-    // migration fails then the data base is left in a situation where the exp
-    // migration can't happen.
-
-    if (!chipProcessedCompleteExp(config)) {
-        // rollback
-        if (!psDBRollback(config->dbh)) {
-            psError(PS_ERR_UNKNOWN, false, "database error");
-        }
-        psError(PS_ERR_UNKNOWN, false, "database error");
-        return false;
-    }
-#endif
 
     if (!psDBCommit(config->dbh)) {