Changeset 20062

Timestamp:

Oct 10, 2008, 4:34:12 PM (18 years ago)

Author:

Paul Price

Message:

Adding more QA fields for diff.

Location:

trunk

Files:

• ippScripts/scripts/diff_skycell.pl (modified) (1 diff)
• ippTools/share/pxadmin_create_tables.sql (modified) (1 diff)
• ippTools/src/difftool.c (modified) (2 diffs)
• ippTools/src/difftoolConfig.c (modified) (1 diff)

trunk/ippScripts/scripts/diff_skycell.pl

@@ -56 +56 @@
    [
        #          PPSTATS KEYWORD         STATISTIC          DIFFTOOL FLAG
-       { name => "ROBUST_MEDIAN",    type => "mean", flag => "-bg",          dtype => "float" },
-       { name => "ROBUST_STDEV",     type => "rms",  flag => "-bg_stdev",    dtype => "float" },
-       { name => "TIME_SUB",         type => "sum",  flag => "-dtime_diff",  dtype => "float" },
-       { name => "TIME_MATCH",       type => "sum",  flag => "-dtime_match", dtype => "float" },
-       { name => "TIME_PHOT",        type => "sum",  flag => "-dtime_phot",  dtype => "float" },
-       { name => "SUBTRACTION.NUM",  type => "mean", flag => "-stamps_num",  dtype => "int" },
-       { name => "SUBTRACTION.MEAN", type => "mean", flag => "-stamps_mean", dtype => "float" },
-       { name => "SUBTRACTION.RMS",  type => "mean", flag => "-stamps_rms",  dtype => "float" },
-       { name => "NUM_SOURCES",      type => "sum",  flag => "-sources",     dtype => "int" },
-       { name => "GOOD_PIXEL_FRAC",  type => "mean", flag => "-good_frac",   dtype => "float" },
+       { name => "ROBUST_MEDIAN",        type => "mean", flag => "-bg",          dtype => "float" },
+       { name => "ROBUST_STDEV",         type => "rms",  flag => "-bg_stdev",    dtype => "float" },
+       { name => "TIME_SUB",             type => "sum",  flag => "-dtime_diff",  dtype => "float" },
+       { name => "TIME_MATCH",           type => "sum",  flag => "-dtime_match", dtype => "float" },
+       { name => "TIME_PHOT",            type => "sum",  flag => "-dtime_phot",  dtype => "float" },
+       { name => "SUBTRACTION.STAMPS",   type => "mean", flag => "-stamps_num",  dtype => "int" },
+       { name => "SUBTRACTION.DEV.MEAN", type => "mean", flag => "-stamps_mean", dtype => "float" },
+       { name => "SUBTRACTION.DEV.RMS",  type => "mean", flag => "-stamps_rms",  dtype => "float" },
+       { name => "SUBTRACTION.NORM",     type => "mean", flag => "-norm",        dtype => "float" },
+       { name => "SUBTRACTION.BGDIFF",   type => "mean", flag => "-bg_diff",     dtype => "float" },
+       { name => "SUBTRACTION.MX",       type => "mean", flag => "-kernel_x",    dtype => "float" },
+       { name => "SUBTRACTION.MY",       type => "mean", flag => "-kernel_y",    dtype => "float" },
+       { name => "SUBTRACTION.MXX",      type => "mean", flag => "-kernel_xx",   dtype => "float" },
+       { name => "SUBTRACTION.MXY",      type => "mean", flag => "-kernel_xy",   dtype => "float" },
+       { name => "SUBTRACTION.MYY",      type => "mean", flag => "-kernel_yy",   dtype => "float" },
+       { name => "NUM_SOURCES",          type => "sum",  flag => "-sources",     dtype => "int" },
+       { name => "GOOD_PIXEL_FRAC",      type => "mean", flag => "-good_frac",   dtype => "float" },
    ];
 my $stats = PS::IPP::Metadata::Stats->new($STATS); # Stats parser

trunk/ippTools/share/pxadmin_create_tables.sql

@@ -954 +954 @@
         stamps_mean FLOAT,
         stamps_rms FLOAT,
+        norm FLOAT,
+        bg_diff FLOAT,
+        kernel_x FLOAT,
+        kernel_y FLOAT,
+        kernel_xx FLOAT,
+        kernel_xy FLOAT,
+        kernel_yy FLOAT,
         sources INT,
         dtime_diff FLOAT,

trunk/ippTools/src/difftool.c

@@ -485 +485 @@
     PXOPT_LOOKUP_F32(stamps_mean, config->args, "-stamps_mean", false, false);
     PXOPT_LOOKUP_F32(stamps_rms, config->args, "-stamps_rms", false, false);
+    PXOPT_LOOKUP_F32(norm, config->args, "-norm", false, false);
+    PXOPT_LOOKUP_F32(bg_diff, config->args, "-bg_diff", false, false);
+    PXOPT_LOOKUP_F32(kernel_x, config->args, "-kernel_x", false, false);
+    PXOPT_LOOKUP_F32(kernel_y, config->args, "-kernel_y", false, false);
+    PXOPT_LOOKUP_F32(kernel_xx, config->args, "-kernel_xx", false, false);
+    PXOPT_LOOKUP_F32(kernel_xy, config->args, "-kernel_xy", false, false);
+    PXOPT_LOOKUP_F32(kernel_yy, config->args, "-kernel_yy", false, false);
     PXOPT_LOOKUP_S32(sources, config->args, "-sources", false, false);
     PXOPT_LOOKUP_STR(hostname, config->args, "-hostname", false, false);
@@ -503 +510 @@
                            stamps_mean,
                            stamps_rms,
+                           norm,
+                           bg_diff,
+                           kernel_x,
+                           kernel_y,
+                           kernel_xx,
+                           kernel_xy,
+                           kernel_yy,
                            sources,
                            dtime_diff,

trunk/ippTools/src/difftoolConfig.c

@@ -102 +102 @@
     psMetadataAddF32(adddiffskyfileArgs, PS_LIST_TAIL, "-stamps_mean", 0, "define subtraction stamp mean", NAN);
     psMetadataAddF32(adddiffskyfileArgs, PS_LIST_TAIL, "-stamps_rms",  0,            "define subtraction stamp rms", NAN);
+    psMetadataAddF32(adddiffskyfileArgs, PS_LIST_TAIL, "-norm",  0, "define normalisation", NAN);
+    psMetadataAddF32(adddiffskyfileArgs, PS_LIST_TAIL, "-bg_diff",  0, "define background difference", NAN);
+    psMetadataAddF32(adddiffskyfileArgs, PS_LIST_TAIL, "-kernel_x",  0, "define kernel x moment", NAN);
+    psMetadataAddF32(adddiffskyfileArgs, PS_LIST_TAIL, "-kernel_y",  0, "define kernel y moment", NAN);
+    psMetadataAddF32(adddiffskyfileArgs, PS_LIST_TAIL, "-kernel_xx",  0, "define kernel xx moment", NAN);
+    psMetadataAddF32(adddiffskyfileArgs, PS_LIST_TAIL, "-kernel_xy",  0, "define kernel xy moment", NAN);
+    psMetadataAddF32(adddiffskyfileArgs, PS_LIST_TAIL, "-kernel_yy",  0, "define kernel yy moment", NAN);
     psMetadataAddS32(adddiffskyfileArgs, PS_LIST_TAIL, "-sources",  0,            "define number of sources", 0);
     psMetadataAddStr(adddiffskyfileArgs, PS_LIST_TAIL, "-hostname", 0,            "define hostname", 0);