Changeset 25747

Timestamp:

Oct 2, 2009, 12:13:33 PM (17 years ago)

Author:

eugene

Message:

merge changes from trunk

Location:

branches/eam_branches/20090715/ippconfig

Files:

• dvo.photcodes (modified) (1 diff)
• recipes/filerules-split.mdc (modified) (1 diff)
• recipes/ppStack.config (modified) (1 diff)
• simtest/ppSim.config (modified) (1 diff)
• vysos5/format_flipped.config (modified) (1 diff)
• vysos5/psastro.config (modified) (3 diffs)

branches/eam_branches/20090715/ippconfig/dvo.photcodes

@@ -500 +500 @@
   3500  ISP-Apogee-01.z      dep  17.250  0.000 0.000     -     - 0.0000     0     4   0.000 0.000 0.000  0.000   0x0000 0x0000  0x0000 0x0000  
   3600  ISP-Apogee-01.y      dep  14.150  0.000 0.000     -     - 0.0000     0     5   0.000 0.000 0.000  0.000   0x0000 0x0000  0x0000 0x0000  
+
+  # VYSOS photcodes -- add as needed
+  5002  VYSOS5.r             dep  17.200  0.000 0.000     -     - 0.0000     0     2   0.000 0.000 0.000  0.000   0x0000 0x0000  0x0000 0x0000  
 
   4100  SIMTEST.g.Chip       dep  25.000  0.000 0.000     -     - 0.0000     0     1   0.000 0.000 0.000  0.000   0x0000 0x0000  0x0000 0x0000  

branches/eam_branches/20090715/ippconfig/recipes/filerules-split.mdc

@@ -146 +146 @@
 PPMERGE.OUTPUT.SHUTTER  OUTPUT {OUTPUT}.{CHIP.NAME}.fits         IMAGE     NONE       CHIP       TRUE      NONE
 PPMERGE.OUTPUT.FLAT     OUTPUT {OUTPUT}.{CHIP.NAME}.fits         IMAGE     NONE       CHIP       TRUE      NONE
-PPMERGE.OUTPUT.FRINGE   OUTPUT {OUTPUT}.{CHIP.NAME}.fits         FRINGE    NONE       CHIP       TRUE      NONE
-PPMERGE.OUTPUT.SIGMA    OUTPUT {OUTPUT}.{CHIP.NAME}.sigma.fits   IMAGE     NONE       CHIP       TRUE      NONE
-PPMERGE.OUTPUT.COUNT    OUTPUT {OUTPUT}.{CHIP.NAME}.count.fits   IMAGE     NONE       CHIP       TRUE      NONE
+PPMERGE.OUTPUT.FRINGE   OUTPUT {OUTPUT}.{CHIP.NAME}.fits         FRINGE    NONE       CELL       TRUE      NONE
+PPMERGE.OUTPUT.SIGMA    OUTPUT {OUTPUT}.{CHIP.NAME}.sigma.fits   IMAGE     NONE       CELL       TRUE      NONE
+PPMERGE.OUTPUT.COUNT    OUTPUT {OUTPUT}.{CHIP.NAME}.count.fits   IMAGE     NONE       CELL       TRUE      NONE
                                                                                                         
 DVOCORR.OUTPUT          OUTPUT {OUTPUT}.{CHIP.NAME}.fc.fits      IMAGE     NONE       CHIP       TRUE      NONE

branches/eam_branches/20090715/ippconfig/recipes/ppStack.config

@@ -19 +19 @@
 BIN1            S32     4               # Binning factor for first level
 BIN2            S32     4               # Binning factor for second level
+PHOTOMETRY      BOOL    TRUE            # Do basic photometry?
 SKIP.BG.SUB     BOOL    FALSE           # Bypass background subtraction?
 

branches/eam_branches/20090715/ippconfig/simtest/ppSim.config

@@ -21 +21 @@
 # for a quick test, we are going to skip shutter and dark corrections
 STACKTEST.MAKE  METADATA
- PSF.MODEL       STR     PS_MODEL_GAUSS
+ PSF.MODEL       STR     PS_MODEL_PGAUSS
  SHUTTER.TIME    F32     0.0
  DARK.RATE       F32     0.0         

branches/eam_branches/20090715/ippconfig/vysos5/format_flipped.config

@@ -56 +56 @@
         FPA.INSTRUMENT  STR     VYSOS5
         FPA.DETECTOR    STR     VYSOS5
-        FPA.POSANGLE    STR     0.0
+        FPA.POSANGLE    STR     180.0
         CELL.SATURATION F32     60000
         CELL.BAD        F32     -100 ## XXX this value is bogus, but needs to be context based so residual images do not get half-masked

branches/eam_branches/20090715/ippconfig/vysos5/psastro.config

@@ -26 +26 @@
 # PSASTRO.GRID.MAX.ANGLE F32 360.0
 # PSASTRO.GRID.DEL.ANGLE F32  1.0
-PSASTRO.GRID.MIN.ANGLE F32 +6.0 # start angle (degrees)
-PSASTRO.GRID.MAX.ANGLE F32 +10.0
+PSASTRO.GRID.MIN.ANGLE F32  -20.0 # start angle (degrees)
+PSASTRO.GRID.MAX.ANGLE F32  +20.0
 PSASTRO.GRID.DEL.ANGLE F32  1.0
 
@@ -70 +70 @@
 PSASTRO.CATDIR              STR      SYNTH.BRIGHT
 DVO.GETSTAR.PHOTCODE        STR      r
+DVO.GETSTAR.MAX.RHO         F32      1000.0
 
 PHOTCODE.DATA MULTI
@@ -92 +93 @@
 # DVO.GETSTAR.MAG.MAX         F32      20.0
 # XXX need to be able to limit the density!
+
+# XXX this does not really make sense -- a single chip model cannot be inconsistent in rotation with the model!
+PSASTRO.ANGLE.TOLERANCE       F32      10.0