Changeset 28089 for trunk/ippTools

Timestamp:

May 25, 2010, 1:17:19 PM (16 years ago)

Author:

watersc1

Message:

Hopefully final edits for maskstats code

Location:

trunk/ippTools

Files:

• share/pxadmin_create_tables.sql (modified) (2 diffs)
• src/camtool.c (modified) (3 diffs)
• src/camtoolConfig.c (modified) (1 diff)
• src/pxtools.c (modified) (2 diffs)
• src/pxtools.h (modified) (1 diff)

trunk/ippTools/share/pxadmin_create_tables.sql

@@ -400 +400 @@
     magicked BIGINT,
     software_ver VARCHAR(16),
-    maskfrac_npix FLOAT,
-    maskfrac_static FLOAT,
-    maskfrac_dynamic FLOAT,
-    maskfrac_magic FLOAT,
-    maskfrac_advisory FLOAT,
+    maskfrac_ref_npix FLOAT,
+    maskfrac_ref_static FLOAT,
+    maskfrac_ref_dynamic FLOAT,
+    maskfrac_ref_magic FLOAT,
+    maskfrac_ref_advisory FLOAT,
+    maskfrac_max_npix FLOAT,
+    maskfrac_max_static FLOAT,
+    maskfrac_max_dynamic FLOAT,
+    maskfrac_max_magic FLOAT,
+    maskfrac_max_advisory FLOAT,
     note VARCHAR(255),
     PRIMARY KEY(cam_id),
@@ -483 +488 @@
     fault SMALLINT NOT NULL,
     software_ver VARCHAR(16),
-    maskfrac_npix INT,
-    maskfrac_static FLOAT,
-    maskfrac_dynamic FLOAT,
-    maskfrac_magic FLOAT,
-    maskfrac_advisory FLOAT,
+    maskfrac_ref_npix INT,
+    maskfrac_ref_static FLOAT,
+    maskfrac_ref_dynamic FLOAT,
+    maskfrac_ref_magic FLOAT,
+    maskfrac_ref_advisory FLOAT,
+    maskfrac_max_npix INT,
+    maskfrac_max_static FLOAT,
+    maskfrac_max_dynamic FLOAT,
+    maskfrac_max_magic FLOAT,
+    maskfrac_max_advisory FLOAT,
     PRIMARY KEY(cam_id),
     KEY(fault),

trunk/ippTools/src/camtool.c

@@ -490 +490 @@
     PXOPT_LOOKUP_STR(ver_streaks, config->args, "-ver_streaks", false, false);
 
-    PXOPT_LOOKUP_S32(maskfrac_npix, config->args, "-maskfrac_npix", false, false);
-    PXOPT_LOOKUP_F32(maskfrac_static, config->args, "-maskfrac_static", false, false);
-    PXOPT_LOOKUP_F32(maskfrac_dynamic, config->args, "-maskfrac_dynamic", false, false);
-    PXOPT_LOOKUP_F32(maskfrac_magic, config->args, "-maskfrac_magic", false, false);
-    PXOPT_LOOKUP_F32(maskfrac_advisory, config->args, "-maskfrac_advisory", false, false);
-
-    psTrace("czw.test",1,"Received versions: pslib %s psmodules %s psphot %s psastro %s ppstats %s ppImage %s streaks %s\n",
-            ver_pslib,ver_psmodules,ver_psphot,ver_psastro,ver_ppstats,ver_ppimage,ver_streaks);
+    PXOPT_LOOKUP_S32(maskfrac_ref_npix, config->args, "-maskfrac_ref_npix", false, false);
+    PXOPT_LOOKUP_F32(maskfrac_ref_static, config->args, "-maskfrac_ref_static", false, false);
+    PXOPT_LOOKUP_F32(maskfrac_ref_dynamic, config->args, "-maskfrac_ref_dynamic", false, false);
+    PXOPT_LOOKUP_F32(maskfrac_ref_magic, config->args, "-maskfrac_ref_magic", false, false);
+    PXOPT_LOOKUP_F32(maskfrac_ref_advisory, config->args, "-maskfrac_ref_advisory", false, false);
+
+    PXOPT_LOOKUP_S32(maskfrac_max_npix, config->args, "-maskfrac_max_npix", false, false);
+    PXOPT_LOOKUP_F32(maskfrac_max_static, config->args, "-maskfrac_max_static", false, false);
+    PXOPT_LOOKUP_F32(maskfrac_max_dynamic, config->args, "-maskfrac_max_dynamic", false, false);
+    PXOPT_LOOKUP_F32(maskfrac_max_magic, config->args, "-maskfrac_max_magic", false, false);
+    PXOPT_LOOKUP_F32(maskfrac_max_advisory, config->args, "-maskfrac_max_advisory", false, false);
+
+/*     psTrace("czw.test",1,"Received versions: pslib %s psmodules %s psphot %s psastro %s ppstats %s ppImage %s streaks %s\n", */
+/*          ver_pslib,ver_psmodules,ver_psphot,ver_psastro,ver_ppstats,ver_ppimage,ver_streaks); */
     psString software_ver = NULL;
     if ((ver_pslib)&&(ver_psmodules)) {
@@ -632 +638 @@
         fault,
         software_ver,
-        maskfrac_npix,
-        maskfrac_static,
-        maskfrac_dynamic,
-        maskfrac_magic,
-        maskfrac_advisory,
+        maskfrac_ref_npix,
+        maskfrac_ref_static,
+        maskfrac_ref_dynamic,
+        maskfrac_ref_magic,
+        maskfrac_ref_advisory,
+        maskfrac_max_npix,
+        maskfrac_max_static,
+        maskfrac_max_dynamic,
+        maskfrac_max_magic,
+        maskfrac_max_advisory,
         quality
         );
@@ -674 +685 @@
     }
     // Set chipRun.maskfrac* to the appropriate values.
-    if (maskfrac_npix) {
-      if (!pxSetRunMaskfrac(config, "camRun", "cam_id",cam_id, (float) maskfrac_npix, maskfrac_static,
-                            maskfrac_dynamic, maskfrac_magic, maskfrac_advisory)) {
+    if (maskfrac_ref_npix) {
+      if (!pxCamSetRunMaskfrac(config, "camRun", "cam_id",cam_id,
+                               (float) maskfrac_ref_npix, maskfrac_ref_static,
+                               maskfrac_ref_dynamic, maskfrac_ref_magic, maskfrac_ref_advisory,
+                               (float) maskfrac_max_npix, maskfrac_max_static,
+                               maskfrac_max_dynamic, maskfrac_max_magic, maskfrac_max_advisory)) {
         if (!psDBRollback(config->dbh)) {
           psError(PS_ERR_UNKNOWN, false, "database error");

trunk/ippTools/src/camtoolConfig.c

@@ -182 +182 @@
     psMetadataAddStr(addprocessedexpArgs, PS_LIST_TAIL, "-ver_streaks", 0, "define streaksremove version", NULL);
 
-    psMetadataAddS32(addprocessedexpArgs, PS_LIST_TAIL, "-maskfrac_npix", 0, "define number of pixels used for maskstats", 0);
-    psMetadataAddF32(addprocessedexpArgs, PS_LIST_TAIL, "-maskfrac_static", 0, "define static mask fraction", NAN);
-    psMetadataAddF32(addprocessedexpArgs, PS_LIST_TAIL, "-maskfrac_dynamic", 0, "define dynamic mask fraction", NAN);
-    psMetadataAddF32(addprocessedexpArgs, PS_LIST_TAIL, "-maskfrac_magic", 0, "define magic mask fraction", NAN);
-    psMetadataAddF32(addprocessedexpArgs, PS_LIST_TAIL, "-maskfrac_advisory", 0, "define advisory mask fraction", NAN);
+    psMetadataAddS32(addprocessedexpArgs, PS_LIST_TAIL, "-maskfrac_ref_npix", 0, "define number of pixels used for maskstats", 0);
+    psMetadataAddF32(addprocessedexpArgs, PS_LIST_TAIL, "-maskfrac_ref_static", 0, "define static mask fraction", NAN);
+    psMetadataAddF32(addprocessedexpArgs, PS_LIST_TAIL, "-maskfrac_ref_dynamic", 0, "define dynamic mask fraction", NAN);
+    psMetadataAddF32(addprocessedexpArgs, PS_LIST_TAIL, "-maskfrac_ref_magic", 0, "define magic mask fraction", NAN);
+    psMetadataAddF32(addprocessedexpArgs, PS_LIST_TAIL, "-maskfrac_ref_advisory", 0, "define advisory mask fraction", NAN);
+
+    psMetadataAddS32(addprocessedexpArgs, PS_LIST_TAIL, "-maskfrac_max_npix", 0, "define number of pixels used for maskstats", 0);
+    psMetadataAddF32(addprocessedexpArgs, PS_LIST_TAIL, "-maskfrac_max_static", 0, "define static mask fraction", NAN);
+    psMetadataAddF32(addprocessedexpArgs, PS_LIST_TAIL, "-maskfrac_max_dynamic", 0, "define dynamic mask fraction", NAN);
+    psMetadataAddF32(addprocessedexpArgs, PS_LIST_TAIL, "-maskfrac_max_magic", 0, "define magic mask fraction", NAN);
+    psMetadataAddF32(addprocessedexpArgs, PS_LIST_TAIL, "-maskfrac_max_advisory", 0, "define advisory mask fraction", NAN);
 
 

trunk/ippTools/src/pxtools.c

@@ -150 +150 @@
   return(true);
 }
+
 bool pxSetRunMaskfrac(pxConfig *config, const psString tableName, const psString stage_id_name, const psS64 stage_id,
                       psS64 maskfrac_npix, psF32 maskfrac_static, psF32 maskfrac_dynamic,
@@ -156 +157 @@
   if (!p_psDBRunQueryF(config->dbh,query,tableName,(float) maskfrac_npix,maskfrac_static,
                        maskfrac_dynamic, maskfrac_magic,maskfrac_advisory,stage_id_name,stage_id)) {
+    psError(PS_ERR_UNKNOWN, false,
+            "failed to set maskfrac stats for %s %" PRId64,stage_id_name,stage_id);
+    return(false);
+  }
+  
+
+
+  return(true);
+}
+
+bool pxCamSetRunMaskfrac(pxConfig *config, const psString tableName, const psString stage_id_name, const psS64 stage_id,
+                         psS64 maskfrac_ref_npix, psF32 maskfrac_ref_static, psF32 maskfrac_ref_dynamic,
+                         psF32 maskfrac_ref_magic, psF32 maskfrac_ref_advisory,
+                         psS64 maskfrac_max_npix, psF32 maskfrac_max_static, psF32 maskfrac_max_dynamic,
+                         psF32 maskfrac_max_magic, psF32 maskfrac_max_advisory) {
+  char *query = "UPDATE %s SET maskfrac_ref_npix = %f, maskfrac_ref_static = %f, maskfrac_ref_dynamic = %f, maskfrac_ref_magic = %f, maskfrac_ref_advisory = %f, maskfrac_max_npix = %f, maskfrac_max_static = %f, maskfrac_max_dynamic = %f, maskfrac_max_magic = %f, maskfrac_max_advisory = %f WHERE %s = %" PRId64;
+  if (!p_psDBRunQueryF(config->dbh,query,tableName,(float) maskfrac_ref_npix,maskfrac_ref_static,
+                       maskfrac_ref_dynamic, maskfrac_ref_magic,maskfrac_ref_advisory,
+                       (float) maskfrac_max_npix,maskfrac_max_static,
+                       maskfrac_max_dynamic, maskfrac_max_magic,maskfrac_max_advisory,
+                       stage_id_name,stage_id)) {
     psError(PS_ERR_UNKNOWN, false,
             "failed to set maskfrac stats for %s %" PRId64,stage_id_name,stage_id);

trunk/ippTools/src/pxtools.h

@@ -62 +62 @@
                       psS64 maskfrac_npix, psF32 maskfrac_static, psF32 maskfrac_dynamic,
                       psF32 maskfrac_magic, psF32 maskfrac_advisory);
+bool pxCamSetRunMaskfrac(pxConfig *config, const psString tableName, const psString stage_id_name, const psS64 stage_id,
+                         psS64 maskfrac_ref_npix, psF32 maskfrac_ref_static, psF32 maskfrac_ref_dynamic,
+                         psF32 maskfrac_ref_magic, psF32 maskfrac_ref_advisory,
+                         psS64 maskfrac_max_npix, psF32 maskfrac_max_static, psF32 maskfrac_max_dynamic,
+                         psF32 maskfrac_max_magic, psF32 maskfrac_max_advisory);
 
 bool pxSetStateCleaned(const psString tableName, const psString columnName, psArray *rows);