Changeset 32950

Timestamp:

Dec 13, 2011, 11:20:08 AM (15 years ago)

Author:

bills

Message:

Change filerule for PSASTRO.OUTPUT to allow it to be changed from smf to cmf.
Add new recipe for static sky calibration

Location:

trunk/ippconfig

Files:

• lbc_red/filerules.mdc (modified) (1 diff)
• recipes/filerules-mef.mdc (modified) (2 diffs)
• recipes/filerules-split.mdc (modified) (2 diffs)
• recipes/ppStatsFromMetadata.config (modified) (1 diff)
• recipes/psastro.config (modified) (1 diff)

trunk/ippconfig/lbc_red/filerules.mdc

@@ -136 +136 @@
 PSASTRO.OUTPUT.CMP    OUTPUT {OUTPUT}.{CHIP.NAME}.smp         CMP       NONE      CHIP       TRUE      NONE
 PSASTRO.OUT.CMF.SPL   OUTPUT {OUTPUT}.{CHIP.NAME}.smf         CMF       NONE      CHIP       TRUE      NONE
+PSASTRO.OUTPUT.CMF   OUTPUT {OUTPUT}.{CHIP.NAME}.smf         CMF       NONE      CHIP       TRUE      NONE
 PSASTRO.OUT.CMF.MEF   OUTPUT {OUTPUT}.smf                     CMF       NONE      FPA        TRUE      NONE
 PSASTRO.OUT.ASTROM    OUTPUT {OUTPUT}.ast                     ASTROM    NONE      FPA        TRUE      NONE

trunk/ippconfig/recipes/filerules-mef.mdc

@@ -42 +42 @@
 PSASTRO.INPUT         STR PSASTRO.INPUT.CMF
 PSASTRO.OUTPUT.MEF    STR PSASTRO.OUT.CMF.MEF
+#PSASTRO.OUTPUT.CMF    STR PSASTRO.OUT.CMF
 DVOCORR.OUTPUT        STR DVOCORR.MEF.OUTPUT
 DVOFLAT.OUTPUT        STR DVOFLAT.MEF.OUTPUT
@@ -243 +244 @@
 PSASTRO.OUT.CMF.SPL     OUTPUT {OUTPUT}.{CHIP.NAME}.smf          CMF       NONE       CHIP       TRUE      SPLIT
 PSASTRO.OUT.CMF.MEF     OUTPUT {OUTPUT}.smf                      CMF       NONE       FPA        TRUE      MEF
+PSASTRO.OUTPUT.CMF      OUTPUT {OUTPUT}.cmf                      CMF       NONE       CHIP       TRUE      NONE
+#PSASTRO.OUT.CMF         OUTPUT {OUTPUT}.smf                      CMF       NONE       FPA        TRUE      NONE
 PSASTRO.OUT.MODEL       OUTPUT {OUTPUT}.asm                ASTROM.MODEL    NONE       FPA        TRUE      NONE
 PSASTRO.OUT.REFSTARS    OUTPUT {OUTPUT}.aref.fits          ASTROM.REFSTARS NONE       FPA        TRUE      NONE

trunk/ippconfig/recipes/filerules-split.mdc

@@ -13 +13 @@
 SOURCE.PLOT.APRESID  STR SOURCE.PLOT.RAW.APRESID
 
-# PSASTRO.OUTPUT     STR PSASTRO.OUT.CMF.MEF
+PSASTRO.OUTPUT     STR PSASTRO.OUT.CMF.MEF
 # PSASTRO.OUTPUT.SPL STR PSASTRO.OUT.CMF.SPL
 # PSASTRO.OUTPUT.MEF STR PSASTRO.OUT.CMF.MEF
@@ -245 +245 @@
 # PSASTRO.OUTPUT.CMP         OUTPUT {OUTPUT}.{CHIP.NAME}.smp          CMP             NONE       CHIP       TRUE      NONE
 # PSASTRO.OUT.CMF.SPL        OUTPUT {OUTPUT}.{CHIP.NAME}.smf          CMF             NONE       CHIP       TRUE      NONE
-# PSASTRO.OUT.CMF.MEF        OUTPUT {OUTPUT}.smf                      CMF             NONE       FPA        TRUE      MEF
 PSASTRO.OUT.MODEL            OUTPUT {OUTPUT}.asm                      ASTROM.MODEL    NONE       FPA        TRUE      NONE
 PSASTRO.OUT.REFSTARS         OUTPUT {OUTPUT}.aref.fits                ASTROM.REFSTARS NONE       FPA        TRUE      NONE
-PSASTRO.OUTPUT               OUTPUT {OUTPUT}.smf                      CMF             NONE       FPA        TRUE      MEF
+PSASTRO.OUT.CMF.MEF          OUTPUT {OUTPUT}.smf                      CMF             NONE       FPA        TRUE      MEF
+PSASTRO.OUTPUT.CMF           OUTPUT {OUTPUT}.cmf                      CMF             NONE       FPA        TRUE      NONE
 PSASTRO.STATS                OUTPUT {OUTPUT}.stats                    STATS           NONE       FPA        TRUE      NONE
 PSASTRO.CONFIG               OUTPUT {OUTPUT}.psastro.mdc              TEXT            NONE       FPA        TRUE      NONE

trunk/ippconfig/recipes/ppStatsFromMetadata.config

@@ -536 +536 @@
 # ENTRY  VAL  REPLICATE_OUTPUTS   F32  CONSTANT          -dtime_replicate  # time to replicate the outputs
 END
+
+STATICSKY_CAL METADATA
+  ENTRY MULTI
+  TYPE   VAL  KEYWORD             TYPE STATISTIC         FLAG 
+  ENTRY  VAL  CERROR              F32  CONSTANT         -sigma_ra          
+  ENTRY  VAL  CERROR              F32  CONSTANT         -sigma_dec         
+  ENTRY  VAL  DT_ASTR             F32  CONSTANT         -dtime_astrom      
+  ENTRY  VAL  NASTRO              S32  CONSTANT         -n_astrom          
+
+  ENTRY  VAL  ZPT_OBS             F32  CONSTANT         -zpt_obs
+  ENTRY  VAL  ZPT_ERR             F32  CONSTANT         -zpt_err
+
+  ENTRY  VAL  QUALITY             S32  CONSTANT          -quality             # Bad quality flag
+
+  # Revision values
+  ENTRY  VAL  PSLIB_V             STR  CONSTANT         -ver_pslib
+  ENTRY  VAL  MODULE_V            STR  CONSTANT         -ver_psmodules
+  ENTRY  VAL  PHOT_V              STR  CONSTANT         -ver_psphot
+  ENTRY  VAL  ASTRO_V             STR  CONSTANT         -ver_psastro
+  ENTRY  VAL  STATS_V             STR  CONSTANT         -ver_ppstats
+#   ENTRY        VAL  IMAGE_V             STR  CONSTANT         -ver_ppimage
+END

trunk/ippconfig/recipes/psastro.config

@@ -258 +258 @@
 END
 
+STATICSKY_CAL   METADATA
+    REFSTAR_MASK                BOOL FALSE
+    PSASTRO.SAVE.REFMATCH       BOOL FALSE
+    PSASTRO.FIX.CHIPS           BOOL FALSE
+    PSASTRO.USE.MODEL           BOOL FALSE
+    PSASTRO.MOSAIC.MODE         BOOL FALSE
+END