Changeset 42820 for branches/eam_branches/ipp-20230313/ippconfig

Timestamp:

May 8, 2025, 4:10:23 PM (15 months ago)

Author:

eugene

Message:

merge changes from trunk

Location:

branches/eam_branches/ipp-20230313

Files:

• . (modified) (1 prop)
• ippconfig (modified) (1 prop)
• ippconfig/Makefile.am (modified) (3 diffs)
• ippconfig/gpc1/ppImage.config (modified) (1 diff)
• ippconfig/recipes/psphot.config (modified) (2 diffs)
• ippconfig/simple/camera.config (modified) (1 diff)
• ippconfig/simple/format.config (modified) (1 diff)
• ippconfig/simple/ppMerge.config (copied) (copied from trunk/ippconfig/simple/ppMerge.config )
• ippconfig/simquad (copied) (copied from trunk/ippconfig/simquad )
• ippconfig/system.config (modified) (1 diff)

branches/eam_branches/ipp-20230313/ippconfig/Makefile.am

@@ +1 @@
+TGT  = $(PSCONFDIR)/$(PSCONFIG)/etc/compress.mgc
+
 SUBDIRS = \
         recipes \
@@ -36 +38 @@
 built_files = \
         ipprc.config \
-        dvo.site
+        dvo.site \
+        $(TGT)
 
 installdir = $(datadir)/ippconfig
@@ -64 +67 @@
 
 
-TGTDIR  = $(PSCONFDIR)/$(PSCONFIG)/etc
-SRC     =       compress
-TGT     =       $(TGTDIR)/compress.mgc
-
-install: $(TGT)
-build:   $(MGC)
 
 if HAVE_LINUX

branches/eam_branches/ipp-20230313/ippconfig/gpc1/ppImage.config

@@ -1139 +1139 @@
 END
 
+# CZW 2018-02-14
+# The default PPIMAGE_N includes BACKGROUND=T, and that breaks detrend construction
+PPIMAGE_N          METADATA
+  BASE.FITS        BOOL    TRUE            # Save base detrended image?
+  BASE.MASK.FITS   BOOL    FALSE           # Save base detrended image?
+  BASE.VARIANCE.FITS BOOL    FALSE           # Save base detrended image?
+  CHIP.FITS        BOOL    FALSE           # Save chip-mosaic-ed image? 
+  CHIP.MASK.FITS   BOOL    FALSE           # Save chip-mosaic-ed image? 
+  CHIP.VARIANCE.FITS BOOL    FALSE           # Save chip-mosaic-ed image? 
+  OVERSCAN         BOOL    FALSE           # Overscan subtraction
+  NONLIN           BOOL    FALSE           # Non-linearity correction; not implemented
+  BIAS             BOOL    FALSE           # Bias subtraction
+  DARK             BOOL    FALSE           # Dark subtraction
+  SHUTTER          BOOL    FALSE           # Shutter correction
+  FLAT             BOOL    FALSE           # Flat-field normalisation
+  MASK             BOOL    FALSE           # Mask bad pixels
+  MASK.BUILD       BOOL    FALSE           # Build internal mask?
+  FRINGE           BOOL    FALSE           # Fringe subtraction
+  PHOTOM           BOOL    FALSE           # Source identification and photometry
+  ASTROM.CHIP      BOOL    FALSE           # Astrometry per chip?
+  ASTROM.MOSAIC    BOOL    FALSE           # Astrometry for mosaic?
+  BIN1.FITS        BOOL    TRUE            # Save 1st binned chip image?
+  BIN2.FITS        BOOL    TRUE            # Save 2nd binned chip image?
+  BACKGROUND       BOOL    FALSE           # Subtract background?
+END
+
 # JPEG images for different types of residual images
 # Save JPEG from BIN1 for bias

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

@@ -107 +107 @@
 PSF_CLUMP_NY                        S32   1               # selecting PSF stars
 
+PSF_CLUMP_USE_CLIPPED_STATS         BOOL  TRUE            # define clump usig CLIPPED stats or ROBUST stats
+
 PSF_MIN_DS                          F32   0.01
 PSF_PARAM_WEIGHTS                   BOOL  FALSE
@@ -113 +115 @@
 LMM_FIT_GAIN_FACTOR_MODE            S32   0               # there are 3 options to determine the gain factor (0,1,2)
 LMM_FIT_USE_REWEIGHTING             BOOL  FALSE           # use IRLS-style reweighting (TRUE) or ordinary LMM
+
+PSF_FIT_STAR_COORDS                 BOOL  FALSE           # if TRUE, fit position as well as shape for PSF stars
 
 PSF_FIT_ITER                        S32   50              # Maximum number of fitting iterations for PSF

branches/eam_branches/ipp-20230313/ippconfig/simple/camera.config

@@ -42 +42 @@
 RECIPES         METADATA
         PPIMAGE         STR     simple/ppImage.config   # Default: all (normal) options on
+        PPMERGE         STR     simple/ppMerge.config   # Default: all (normal) options on
         PSPHOT          STR     simple/psphot.config    # psphot details
 END

branches/eam_branches/ipp-20230313/ippconfig/simple/format.config

@@ -20 +20 @@
 CELLS   METADATA
         amplifier       METADATA
-                CELL.TRIMSEC.SOURCE     STR     VALUE
-                CELL.TRIMSEC            STR     [0:0,0:0]
+                # CELL.TRIMSEC.SOURCE   STR     VALUE
+                # CELL.TRIMSEC          STR     [0:0,0:0]
                 # alternatives for getting these from the headers
-                # CELL.TRIMSEC.SOURCE   STR     HEADER
-                # CELL.BIASSEC.SOURCE   STR     VALUE
-                # CELL.TRIMSEC          STR     DATASEC
-                # CELL.BIASSEC          STR     BIASSEC
+                CELL.TRIMSEC.SOURCE     STR     HEADER
+                CELL.BIASSEC.SOURCE     STR     HEADER
+                CELL.TRIMSEC            STR     DATASEC
+                CELL.BIASSEC            STR     BIASSEC
         END
 END

branches/eam_branches/ipp-20230313/ippconfig/system.config

@@ -23 +23 @@
         SUPRIMECAM              STR     suprime/camera.config           # Subaru Suprimecam
         SIMMOSAIC               STR     simmosaic/camera.config         # Simulated mosaic, for testing
-        SIMTEST                 STR     simtest/camera.config           # Simulation test camera
+        SIMTEST                 STR     simtest/camera.config           # Simulation test camera
+#       SIMQUAD                 STR     simquad/camera.config           # Simulation test camera
         SIMPLE                  STR     simple/camera.config            # If all else fails....
 END