Changeset 10871

Timestamp:

Jan 1, 2007, 11:04:52 AM (19 years ago)

Author:

eugene

Message:

updated config values

Location:

trunk/ippconfig

Files:

• ctio_mosaic2/psphot.config (modified) (1 diff)
• ctio_mosaic2_chip/camera.config (modified) (1 diff)
• ctio_mosaic2_chip/psphot.config (modified) (1 diff)
• isp/camera.config (modified) (1 diff)
• megacam_detrended/camera.config (modified) (3 diffs)
• recipes/psastro.config (modified) (2 diffs)

trunk/ippconfig/ctio_mosaic2/psphot.config

@@ -101 +101 @@
 # test options
 # BREAK_POINT may be one of (PEAKS, MOMENTS, PSFMODEL, ENSEMBLE)
-# BREAK_POINT           STR  ENSEMBLE
+# BREAK_POINT           STR  MOMENTS
 # PEAKS_OUTPUT_FILE   STR  peaks.dat
 # MOMENTS_OUTPUT_FILE STR  moments.dat

trunk/ippconfig/ctio_mosaic2_chip/camera.config

@@ -125 +125 @@
    PSPHOT.PSFMODEL.PLT   OUTPUT   {OUTPUT}.psf.png            NONE          NONE         NONE         FPA        FPA        KAPA      TRUE      MOSAIC
 
+   SOURCE.PLOT.MOMENTS  OUTPUT   {OUTPUT}.mnt.png             NONE          NONE         NONE         FPA        FPA        KAPA      TRUE      MOSAIC
+   SOURCE.PLOT.PSFMODEL OUTPUT   {OUTPUT}.psf.png             NONE          NONE         NONE         FPA        FPA        KAPA      TRUE      MOSAIC
+
    PSASTRO.OUTPUT.CMP    OUTPUT {OUTPUT}.{CHIP.NAME}.smp      NONE          NONE         PHU          CHIP       CHIP       CMP       TRUE      NONE
 

trunk/ippconfig/ctio_mosaic2_chip/psphot.config

@@ -101 +101 @@
 # test options
 # BREAK_POINT may be one of (PEAKS, MOMENTS, PSFMODEL, ENSEMBLE)
-# BREAK_POINT           STR  ENSEMBLE
+BREAK_POINT           STR  MOMENTS
 # PEAKS_OUTPUT_FILE   STR  peaks.dat
 # MOMENTS_OUTPUT_FILE STR  moments.dat

trunk/ippconfig/isp/camera.config

@@ -133 +133 @@
    PSPHOT.PSF.SAVE     OUTPUT   {OUTPUT}.psf         NONE          NONE         NONE         PSF       FPA        FPA        TRUE      NONE
 
-   PSPHOT.MOMENT.PLT   OUTPUT   {OUTPUT}.mnt.png     NONE          NONE         NONE         KAPA      FPA        FPA        TRUE      NONE
-   PSPHOT.PSFMODEL.PLT OUTPUT   {OUTPUT}.psf.png     NONE          NONE         NONE         KAPA      FPA        FPA        TRUE      ISP
+   SOURCE.PLOT.MOMENTS  OUTPUT   {OUTPUT}.mnt.png    NONE          NONE         NONE         KAPA      FPA        FPA        TRUE      NONE
+   SOURCE.PLOT.PSFMODEL OUTPUT   {OUTPUT}.psf.png    NONE          NONE         NONE         KAPA      FPA        FPA        TRUE      ISP
 
    PSASTRO.OUTPUT.CMP  OUTPUT   {OUTPUT}.smp         NONE          NONE         NONE         CMP       FPA        FPA        TRUE      NONE

trunk/ippconfig/megacam_detrended/camera.config

@@ -52 +52 @@
         PHASE2          STR     megacam_detrended/phase2.config         # Phase 2 recipe details
         PSPHOT          STR     megacam_detrended/psphot.config         # psphot details
-        PSASTRO         STR     megacam_detrended/psastro.config        # psastro details
 END
 
@@ -59 +58 @@
    PSPHOT.OUTPUT      STR PSPHOT.OUTPUT.CMF
    PSASTRO.INPUT      STR PSASTRO.INPUT.CMP
-   PSASTRO.OUTPUT     STR PSASTRO.OUTPUT.CMP
+   PSASTRO.OUTPUT     STR PSASTRO.OUTPUT.CMF
 
    ### input file definitions
@@ -91 +90 @@
    PSPHOT.OUTPUT.CMP  OUTPUT {OUTPUT}.{CHIP.NAME}.{CELL.NAME}.cmp NONE   NONE         PHU           CELL       CELL       CMP       TRUE      NONE
 
-   PSASTRO.OUTPUT.CMP OUTPUT {OUTPUT}.xmp                  NONE          NONE         PHU           CHIP       CHIP       CMP       TRUE      NONE
+   PSASTRO.OUTPUT.CMP OUTPUT {OUTPUT}.{CHIP.NAME}.xmp      NONE          NONE         PHU           FPA        CHIP       CMP       TRUE      NONE
+   PSASTRO.OUTPUT.CMF OUTPUT {OUTPUT}.xmp                  NONE          {CHIP.NAME}.hdr {CHIP.NAME}.cmf FPA        CHIP       CMF       TRUE      NONE
 END
 

trunk/ippconfig/recipes/psastro.config

@@ -1 +1 @@
 
-# astrometry matching parameters
+# perform single-chip astrometry?
+PSASTRO.CHIP.MODE           BOOL     TRUE
 
 # nominal plate scale (microns / pixel)
-# PSASTRO.PLATE.SCALE    F32  13.5
-PSASTRO.PLATE.SCALE    F32  1.0
+PSASTRO.PIXEL.SCALE    F32  13.5
 
 # pmAstromGridMatch:
@@ -25 +25 @@
 PSASTRO.TWEAK.NSIGMA    F32      3
 
-# pmAstromRadiusMatch
-# use plate-scale to make this in pixels?
+# single-chip radius match in pixels
 PSASTRO.MATCH.RADIUS   F32    8
 
 # pmAstromMatchFit
-PSASTRO.CHIP.NX        S32      1  # fit order
-PSASTRO.CHIP.NY        S32      1  # fit order
+PSASTRO.CHIP.ORDER     S32      1  # fit order
 PSASTRO.CHIP.NITER     S32      3  # fit clipping iterations
 PSASTRO.CHIP.NSIGMA    F32      3  # fit clipping sigmas
 
-PSASTRO.MAX.ERROR      F32      1.5  # fit clipping sigmas
-PSASTRO.MIN.NSTAR      S32      10  # min fitted stars in solution
+PSASTRO.MAX.ERROR      F32      1.5 # max allow error for valid solution (UNITS?)
+PSASTRO.MIN.NSTAR      S32      3  # min fitted stars in solution
 
-MAG_MAX F32 15.0  ## XXX change name to PSASTRO.something
+MAG_MAX F32 18.0  ## XXX change name to PSASTRO.something?
+
+# option may be MAX, MIN, or VALUE. for VALUE, look up 
+# plate scale for each chip in the concepts
+PSASTRO.COMMON.SCALE.OPTION     STR     MAX
+
+# pmAstromRadiusMatch
+# use plate-scale to make this in pixels?
+PSASTRO.MOSAIC.RADIUS.N0   F32    8
+PSASTRO.MOSAIC.RADIUS.N1   F32    8
+PSASTRO.MOSAIC.RADIUS.N2   F32    8
+PSASTRO.MOSAIC.RADIUS.N3   F32    8
+
+# Mosaic Astrometry options
+PSASTRO.MOSAIC.MODE           BOOL     FALSE
+PSASTRO.MOSAIC.CHIP.ORDER     S32      3  # fit order
+PSASTRO.MOSAIC.ORDER          S32      3  # fit order
+PSASTRO.MOSAIC.CHIP.NITER     S32      3  # fit clipping iterations
+PSASTRO.MOSAIC.CHIP.NSIGMA    F32      3  # fit clipping sigmas
+
+PSASTRO.MOSAIC.MAX.ERROR      F32      1.5 # max allow error for valid solution (UNITS?)
+PSASTRO.MOSAIC.MIN.NSTAR      S32      10  # min fitted stars in solution
+