Changeset 20276

Timestamp:

Oct 19, 2008, 2:02:23 PM (18 years ago)

Author:

eugene

Message:

renaming zp_mean, zp_stdev to zpt_obs, zpt_stdev; adding zpt_lq, zpt_uq; adding corresponding camtool options

Location:

trunk/ippTools

Files:

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

trunk/ippTools/configure.ac

@@ -18 +18 @@
 PKG_CHECK_MODULES([PSLIB], [pslib >= 1.1.0])
 PKG_CHECK_MODULES([PSMODULES], [psmodules >= 1.1.0])
-PKG_CHECK_MODULES([IPPDB], [ippdb >= 1.1.45]) 
+PKG_CHECK_MODULES([IPPDB], [ippdb >= 1.1.46]) 
 
 PXTOOLS_CFLAGS="${PSLIB_CFLAGS=} ${PSMODULES_CFLAGS=} ${IPPDB_CFLAGS=}"

trunk/ippTools/share/pxadmin_create_tables.sql

@@ -382 +382 @@
     ap_resid FLOAT,
     ap_resid_stdev FLOAT,
-    zp_mean FLOAT,
-    zp_stdev FLOAT,
+    zpt_obs FLOAT,
+    zpt_stdev FLOAT,
+    zpt_lq FLOAT,
+    zpt_uq FLOAT,
     fwhm_major FLOAT,
     fwhm_major_lq FLOAT,

trunk/ippTools/src/camtool.c

@@ -403 +403 @@
     PXOPT_LOOKUP_F32(ap_resid, config->args,       "-ap_resid", false, false);
     PXOPT_LOOKUP_F32(ap_resid_stdev, config->args, "-ap_resid_stdev", false, false);
-    PXOPT_LOOKUP_F32(zp_mean, config->args, "-zp_mean", false, false);
-    PXOPT_LOOKUP_F32(zp_stdev, config->args, "-zp_stdev", false, false);
+
+    PXOPT_LOOKUP_F32(zpt_obs, config->args,       "-zpt_obs", false, false);
+    PXOPT_LOOKUP_F32(zpt_err, config->args,       "-zpt_err", false, false);
+    PXOPT_LOOKUP_F32(zpt_uq,  config->args,       "-zpt_uq", false, false);
+    PXOPT_LOOKUP_F32(zpt_lq,  config->args,       "-zpt_lq", false, false);
 
     PXOPT_LOOKUP_F32(fwhm_major, config->args,     "-fwhm_major", false, false);
@@ -455 +458 @@
     PXOPT_LOOKUP_S32(n_cr, config->args,           "-n_cr", false, false);
     PXOPT_LOOKUP_S32(n_astrom, config->args,       "-n_astrom", false, false);
+
     PXOPT_LOOKUP_STR(path_base, config->args, "-path_base", false, false);
     PXOPT_LOOKUP_S16(code, config->args, "-code", false, false);
@@ -517 +521 @@
         ap_resid,
         ap_resid_stdev,
-        zp_mean,
-        zp_stdev,
+        zpt_obs,
+        zpt_err,
+        zpt_lq,
+        zpt_uq,
         fwhm_major,
         fwhm_major_lq,

trunk/ippTools/src/camtoolConfig.c

@@ -110 +110 @@
     psMetadataAddF32(addprocessedexpArgs, PS_LIST_TAIL, "-ap_resid",  0,            "define aperture residual", NAN);
     psMetadataAddF32(addprocessedexpArgs, PS_LIST_TAIL, "-ap_resid_stdev",  0,            "define aperture residual stdev", NAN);
-    psMetadataAddF32(addprocessedexpArgs, PS_LIST_TAIL, "-zp_mean", 0,            "define zero point mean", NAN);
-    psMetadataAddF32(addprocessedexpArgs, PS_LIST_TAIL, "-zp_stdev", 0,            "define zero point stdev", NAN);
+
+    psMetadataAddF32(addprocessedexpArgs, PS_LIST_TAIL, "-zpt_obs", 0,   "define observed zero point", 0);
+    psMetadataAddF32(addprocessedexpArgs, PS_LIST_TAIL, "-zpt_err", 0,   "define observed zero point error", 0);
+    psMetadataAddF32(addprocessedexpArgs, PS_LIST_TAIL, "-zpt_uq", 0,   "define observed zero point upper quartile", 0);
+    psMetadataAddF32(addprocessedexpArgs, PS_LIST_TAIL, "-zpt_lq", 0,   "define observed zero point lower quartile", 0);
 
     psMetadataAddF32(addprocessedexpArgs, PS_LIST_TAIL, "-fwhm_major",  0,            "define fwhm (major axis; arcsec)", NAN);
@@ -155 +158 @@
     psMetadataAddS32(addprocessedexpArgs, PS_LIST_TAIL, "-n_cr", 0,            "define number of cosmic rays", 0);
     psMetadataAddS32(addprocessedexpArgs, PS_LIST_TAIL, "-n_astrom", 0,            "define number of astrometry reference objects", 0);
+
     psMetadataAddStr(addprocessedexpArgs, PS_LIST_TAIL, "-path_base", 0,            "define base output location", NULL);
     psMetadataAddS16(addprocessedexpArgs, PS_LIST_TAIL, "-code",  0,            "set fault code", 0);