Changeset 35195

Timestamp:

Feb 21, 2013, 1:42:46 PM (13 years ago)

Author:

bills

Message:

change skycal to use new PPSTATS recipe SKYCALSTATS which is like CAMSTATS
but adds fhwm_major and fwhm_minor

Location:

trunk

Files:

• ippScripts/scripts/skycalibration.pl (modified) (1 diff)
• ippconfig/recipes/ppStats.config (modified) (1 diff)
• ippconfig/recipes/ppStatsFromMetadata.config (modified) (1 diff)

trunk/ippScripts/scripts/skycalibration.pl

@@ -231 +231 @@
     $command .= " -F PSASTRO.OUTPUT $output_sources_filerule";
     $command .= " -stats $stats";
-    $command .= " -recipe PPSTATS CAMSTATS";
+    # $command .= " -recipe PPSTATS CAMSTATS";
+    $command .= " -recipe PPSTATS SKYCALSTATS";
     $command .= " -dumpconfig $configuration" if $configuration;
     $command .= " -tracedest $traceDest";

trunk/ippconfig/recipes/ppStats.config

@@ -358 +358 @@
   ANALYSIS      STR     MASKFRAC_NPIX
 END
+
+# stats for sky calibration (astrometry, summary stats)
+SKYCALSTATS     METADATA
+  HEADER        MULTI
+  HEADER        STR     CERROR
+  HEADER        STR     DT_ASTR  # elapsed time in astrometry processing
+  HEADER        STR     NASTRO
+
+  HEADER        STR     ZPT_OBS
+  HEADER        STR     ZPT_ERR
+  HEADER        STR     FWHM_MAJ
+  HEADER        STR     FWHM_MIN
+
+  HEADER        STR     PSLIB_V
+  HEADER        STR     MODULE_V
+  HEADER        STR     PHOT_V
+  HEADER        STR     ASTRO_V
+  HEADER        STR     STATS_V
+  HEADER        STR     IMAGE_V
+  HEADER        STR     STREAK_V
+  
+  HEADER        STR     NDET            # sources->n
+  HEADER        STR     NDET_EXT
+  HEADER        STR     NDET_FRC
+
+  ANALYSIS      MULTI   # metadata blocks to search in chip/cell/readout->analysis
+  ANALYSIS      STR     PSPHOT.HEADER
+  ANALYSIS      STR     PSASTRO.HEADER
+
+  ANALYSIS      STR     MASKFRAC_REF_STATIC
+  ANALYSIS      STR     MASKFRAC_REF_MAGIC
+  ANALYSIS      STR     MASKFRAC_REF_ADVISORY
+  ANALYSIS      STR     MASKFRAC_REF_DYNAMIC
+  ANALYSIS      STR     MASKFRAC_REF_NPIX
+
+  ANALYSIS      STR     MASKFRAC_MAX_STATIC
+  ANALYSIS      STR     MASKFRAC_MAX_MAGIC
+  ANALYSIS      STR     MASKFRAC_MAX_ADVISORY
+  ANALYSIS      STR     MASKFRAC_MAX_DYNAMIC
+  ANALYSIS      STR     MASKFRAC_MAX_NPIX
+END

trunk/ippconfig/recipes/ppStatsFromMetadata.config

@@ -562 +562 @@
   ENTRY  VAL  ZPT_OBS             F32  CONSTANT         -zpt_obs
   ENTRY  VAL  ZPT_ERR             F32  CONSTANT         -zpt_stdev
+  # don't know why these come out as F64 instead of F32
+  ENTRY  VAL  FWHM_MAJ            F64  CONSTANT         -fhwm_major
+  ENTRY  VAL  FWHM_MIN            F64  CONSTANT         -fhwm_minor
 
   ENTRY  VAL  QUALITY             S32  CONSTANT          -quality             # Bad quality flag