Changeset 36480 for branches/eam_branches/ipp-20131211/ippconfig

Timestamp:

Feb 6, 2014, 11:48:53 AM (12 years ago)

Author:

eugene

Message:

merging changes from trunk

Location:

branches/eam_branches/ipp-20131211

Files:

• . (modified) (1 prop)
• ippconfig (modified) (1 prop)
• ippconfig/gpc1 (modified) (1 prop)
• ippconfig/gpc1/psastro.config (modified) (1 diff)
• ippconfig/recipes/filerules-split.mdc (modified) (1 diff)
• ippconfig/recipes/ppSub.config (modified) (1 prop)
• ippconfig/recipes/psastro.config (modified) (2 diffs)
• ippconfig/recipes/psphot.config (modified) (7 diffs)
• ippconfig/recipes/reductionClasses.mdc (modified) (1 diff, 1 prop)

branches/eam_branches/ipp-20131211/ippconfig/gpc1/psastro.config

@@ -380 +380 @@
 END
 
+POLE_REFCAT METADATA
+   PSASTRO.CATDIR               STR  SYNTH.GRIZY
+   ZERO.POINT.USE.MEAN               BOOL TRUE  
+   PSASTRO.GRID.MIN.ANGLE       F32  -20
+   PSASTRO.GRID.MAX.ANGLE       F32  +20
+   PSASTRO.GRID.DEL.ANGLE       F32   0.5
+   PSASTRO.FIELD.PADDING        F32   0.5
+END
+
 TEST_REFCAT METADATA
    PSASTRO.CATDIR               STR /data/ipp064.0/ipp/ippRefs/catdir.refcat.20120524.v0

branches/eam_branches/ipp-20131211/ippconfig/recipes/filerules-split.mdc

@@ -262 +262 @@
 PSPHOT.STACK.RESID           OUTPUT {OUTPUT}.stk.{FILE.ID}.res.fits   IMAGE           COMP_SUB   FPA        TRUE      NONE
 PSPHOT.STACK.CONFIG          OUTPUT {OUTPUT}.psphotStack.mdc          TEXT            NONE       FPA        TRUE      NONE
+
+PSPHOT.FULLFORCE.OUTPUT      OUTPUT {OUTPUT}.cmf                      CMF             NONE       FPA        TRUE      NONE
                                                      
 SOURCE.PLOT.RAW.MOMENTS      OUTPUT {OUTPUT}.{CHIP.NAME}.mnt.png      KAPA            NONE       CHIP       TRUE      NONE

branches/eam_branches/ipp-20131211/ippconfig/recipes/psastro.config

@@ -3 +3 @@
 PSASTRO.ONLY.REFSTARS      BOOL FALSE  # skip all but refstar matches
 PSASTRO.SAVE.REFMATCH      BOOL FALSE  # save refstar matches as table in output smf file
+PSASTRO.SAVE.CFF           BOOL FALSE  # save a cff file (input for psphotFullForce)
 
 # select which WCS style to use on output images.
@@ -272 +273 @@
 END
 
+POLE_REFCAT METADATA
+END
+
 TEST_REFCAT METADATA
 END
 
 STATICSKY_CAL   METADATA
+    PSASTRO.SAVE.CFF           BOOL TRUE  # save a cff file (input for psphotFullForce)
 END
 

branches/eam_branches/ipp-20131211/ippconfig/recipes/psphot.config

@@ -196 +196 @@
 EXT.NSIGMA.LIMIT.USE                BOOL  TRUE
 
-EXT.FIT.MIN.GAL.LIMIT               F32   10.0
-EXT.FIT.MIN.GAL.LIMIT.USE           BOOL  FALSE
+# Limits on extended source fits by galactic coordinates 
+EXT.FIT.MIN.GAL.LIMIT.USE           BOOL  FALSE # if true apply the galactic latitude cut
+# objects are skipped for extended source fits if they have a abs(galactic latitude) larger than
+# a limit value which is a function of galactic longitude.
+#     The galactic latitude limit is the sum of the following constant value ...
+EXT.FIT.MIN.GAL.LIMIT               F32   20.0
+# ... and a gaussian function of galactic longitude centered at b = 0 with this magnitude
+EXT.FIT.MIN.GAL.LIMIT.BULGE         F32   15.0  
+# ... and this sigma
+EXT.FIT.MIN.GAL.LIMIT.BULGE.SIGMA   F32   50.0  # with this sigma value
+
 
 KRON_ITERATIONS                     S32   2
@@ -224 +233 @@
  #QGAUSS_PSF  EXTENDED_SOURCE_MODEL  PS_MODEL_QGAUSS   20.0    TRUE
  # TRAIL_RAW EXTENDED_SOURCE_MODEL  PS_MODEL_TRAIL    10.0   FALSE
- EXP_PCM  EXTENDED_SOURCE_MODEL  PS_MODEL_EXP      10.0    TRUE
- DEV_PCM  EXTENDED_SOURCE_MODEL  PS_MODEL_DEV      10.0    TRUE
- SER_PCM  EXTENDED_SOURCE_MODEL  PS_MODEL_SERSIC   10.0    TRUE
+ EXP_PCM  EXTENDED_SOURCE_MODEL  PS_MODEL_EXP      0.0    TRUE
+ DEV_PCM  EXTENDED_SOURCE_MODEL  PS_MODEL_DEV      0.0    TRUE
+ SER_PCM  EXTENDED_SOURCE_MODEL  PS_MODEL_SERSIC   0.0    TRUE
 END
 
@@ -407 +416 @@
 
 EXT.ANALYSIS.MAG.LIMITS METADATA
-    TYPE  DATA FILTER.ID MAG.LIMIT
-    gband DATA g         NAN            
-    rband DATA r         NAN             
-    iband DATA i         NAN             
-    zband DATA z         NAN             
-    yband DATA y         NAN             
-    wband DATA w         NAN             
-    other DATA any       NAN             
+    TYPE  DATA FILTER.ID MAG.LIMIT.PETRO    MAG.LIMIT.EXTFIT
+    gband DATA g         25                 21.5
+    rband DATA r         25                 21.5 
+    iband DATA i         25                 21.5
+    zband DATA z         25                 20.5
+    yband DATA y         25                 19.5
+    wband DATA w         25                 21.5
+    other DATA any       25                 21.5
 END
 
@@ -423 +432 @@
 RADIAL_APERTURES_SN_LIM             F32   0.0  # S/N limit for radial aperture calculation
 
+# zero point and exposure time to which fullForceSummary scales fluxes to
+PSPHOT.FULLFORCE.EXPTIME            F32   1.00 
+PSPHOT.FULLFORCE.ZERO_PT            F32   25.00
+
+
 GALAXY_SHAPES                       BOOL  F
+GALAXY_SHAPES_STYLE                 STR   R_MAJ_R_MIN
+
 GALAXY_SHAPES_FR_MAJOR_MIN          F32   0.5
-GALAXY_SHAPES_FR_MAJOR_MAX          F32   2.0
-GALAXY_SHAPES_FR_MAJOR_DEL          F32   0.1
+GALAXY_SHAPES_FR_MAJOR_MAX          F32   2.00
+GALAXY_SHAPES_FR_MAJOR_DEL          F32   0.05
 GALAXY_SHAPES_FR_MINOR_MIN          F32   0.5
-GALAXY_SHAPES_FR_MINOR_MAX          F32   2.0
-GALAXY_SHAPES_FR_MINOR_DEL          F32   0.1
-
+GALAXY_SHAPES_FR_MINOR_MAX          F32   2.00
+GALAXY_SHAPES_FR_MINOR_DEL          F32   0.05
+
+#GALAXY_SHAPES_FR_MAJOR_MIN          F32   0.85
+#GALAXY_SHAPES_FR_MAJOR_MAX          F32   1.15
+#GALAXY_SHAPES_FR_MAJOR_DEL          F32   0.05
+#GALAXY_SHAPES_FR_MINOR_MIN          F32   0.85
+#GALAXY_SHAPES_FR_MINOR_MAX          F32   1.15
+#GALAXY_SHAPES_FR_MINOR_DEL          F32   0.05
 
 # Extended source fit parameters
@@ -439 +461 @@
   EXTENDED_SOURCE_ANNULI              BOOL  TRUE
   EXT.NSIGMA.LIMIT.USE                BOOL  FALSE
+  EXT.FIT.MIN.GAL.LIMIT.USE           BOOL  TRUE  # limit extended source fits by galactic coordinates
 
   PSPHOT.STACK.MATCH.PSF.SOURCE       STR   AUTO # which inputs to convolve? (RAW, CNV, AUTO)
@@ -465 +488 @@
   EXT_MODEL                           STR   PS_MODEL_QGAUSS
   PEAKS_NMAX_TOTAL                    S32   0 # set this to limit the allowed number of peaks - Yields fault instead of avoid memory explosion
+
 
   SAVE.RESID                          BOOL  TRUE
@@ -683 +707 @@
     RADIAL_APERTURES        BOOL    TRUE
     EXTENDED_SOURCE_FITS    BOOL    TRUE    # this casues the xfit extension to be written out
-    EXTENDED_SOURCE_PETROSIAN BOOL    TRUE  # I want petrosian mags
+    EXTENDED_SOURCE_PETROSIAN BOOL  TRUE    # To measure petrosian magnitudes
+    EXTENDED_SOURCE_ANNULI  BOOL    TRUE
     SAVE.PSF                BOOL    FALSE
     SAVE.BACKMDL            BOOL    FALSE
-    # SAVE.RESID            BOOL    FALSE
-    # OUTPUT.FORMAT         STR     PS1_V3
-END
+    SAVE.RESID              BOOL    TRUE
+    OUTPUT.FORMAT           STR     PS1_SV2
+END

branches/eam_branches/ipp-20131211/ippconfig/recipes/reductionClasses.mdc

@@ -251 +251 @@
         BACKGROUND_PSWARP       STR     BACKGROUND
         FULLFORCE_PSPHOT  STR   FULLFORCE_WARP
+END
+
+# basic science analysis
+POLE_REFCAT             METADATA
+        CHIP_PPIMAGE      STR     CHIP
+        CHIP_PSPHOT       STR     CHIP
+        JPEG_BIN1         STR     PPIMAGE_J1
+        JPEG_BIN2         STR     PPIMAGE_J2
+        ADDSTAR           STR     ADDSTAR
+        PSASTRO           STR     POLE_REFCAT
 END