Changeset 35771 for trunk/ippconfig

Timestamp:

Jul 3, 2013, 4:21:05 PM (13 years ago)

Author:

watersc1

Message:

Working 1D-Gaussian convolution code. Recipes/reductions that use this have _1DG added.

Location:

trunk/ippconfig/recipes

Files:

• ppSub.config (modified) (7 diffs)
• reductionClasses.mdc (modified) (2 diffs)

trunk/ippconfig/recipes/ppSub.config

@@ -88 +88 @@
 END
 
+STACK_1DG METADATA
+        SYS.ERR         F32     0.0      # current use of SYS.ERR not appropriate for stacks
+        KERNEL.TYPE     STR     SIMPLE   # Use 1D Gaussian convolution.
+END     
+
 # Recipe overrides for DIFF
 DIFF    METADATA
@@ -108 +113 @@
 END
 
+DIFF_1DG  METADATA
+          KERNEL.TYPE   STR     SIMPLE  # Use 1D Gaussian Convolution
+          DUAL          BOOL    TRUE    # Dual convolution?
+          INVERSE       BOOL    TRUE    # Generate inverse subtraction?
+          PHOTOMETRY    BOOL    TRUE    # Perform photometry
+
+          # This is not really used with the SIMPLE kernel
+          SCALE.REF     F32     5.0     # FWHM reference for kernel parameter scalinng
+          KERNEL.SIZE   S32     15      # Kernel half-size (pixels);
+          STAMP.FOOTPRINT S32   15      # Size of stamps (pixels);
+END
+
 # test setup for nodual case
 DIFF_NODUAL    METADATA   
@@ -143 +160 @@
 END
 
+WARPWARP_1DG    METADATA
+          KERNEL.TYPE   STR     SIMPLE  # Use 1D Gaussian Convolution
+          DUAL          BOOL    TRUE    # Dual convolution?
+          INVERSE       BOOL    TRUE    # Generate inverse subtraction?
+          PHOTOMETRY    BOOL    TRUE    # Perform photometry
+
+          # This is not really used with the SIMPLE kernel
+          SCALE.REF     F32     5.0     # FWHM reference for kernel parameter scalinng
+          KERNEL.SIZE   S32     15      # Kernel half-size (pixels);
+          STAMP.FOOTPRINT S32   15      # Size of stamps (pixels);
+END
+
+
+
 # Difference of warp - stack
 WARPSTACK       METADATA
@@ -151 +182 @@
 END
 
+WARPSTACK_1DG   METADATA
+        KERNEL.TYPE     STR     SIMPLE
+        DUAL            BOOL    FALSE   # Dual convolution?
+        INVERSE         BOOL    FALSE   # Generate inverse subtraction?
+        PHOTOMETRY      BOOL    TRUE    # Perform photometry?
+        CONVOLVE.TARGET STR     SINGLE2 # convolution direction
+END
+
 # Difference of two stacks : uses SINGLE not DUAL convolution
 STACKSTACK      METADATA
@@ -159 +198 @@
 END
 
+STACKSTACK_1DG  METADATA
+        KERNEL.TYPE     STR     SIMPLE
+        DUAL            BOOL    FALSE   # Dual convolution?
+        INVERSE         BOOL    FALSE   # Generate inverse subtraction?
+        PHOTOMETRY      BOOL    TRUE    # Perform photometry?
+        CONVOLVE.TARGET STR     SINGLE2 # convolution direction
+END
+
 # Difference of two stacks : uses SINGLE not DUAL convolution
 STACKPHOT       METADATA
+        DUAL            BOOL    FALSE   # Dual convolution?
+        INVERSE         BOOL    FALSE   # Generate inverse subtraction?
+        PHOTOMETRY      BOOL    TRUE    # Perform photometry?
+        CONVOLVE.TARGET STR     SINGLE2 # convolution direction
+END
+
+STACKPHOT_1DG   METADATA
+        KERNEL.TYPE     STR     SIMPLE
         DUAL            BOOL    FALSE   # Dual convolution?
         INVERSE         BOOL    FALSE   # Generate inverse subtraction?
@@ -200 +255 @@
         DUAL            BOOL    FALSE   # Dual convolution?
         INVERSE         BOOL    FALSE   # Generate inverse subtraction?
-        PHOTOMETRY      BOOL    FALSE   # Perform photometry?
+        PHOTOMETRY      BOOL    TRUE    # Perform photometry?
         NOCONVOLVE      BOOL    TRUE
         CONVOLVE.TARGET STR     SINGLE2 # convolution direction
@@ -258 +313 @@
         CONVOLVE.TARGET STR     SINGLE2 # convolution direction
 END
- 
+
+SSTF_DIFF_1DG METADATA 
+        KERNEL.TYPE     STR     SIMPLE
+        DUAL            BOOL    FALSE   # Dual convolution?
+        INVERSE         BOOL    FALSE   # Generate inverse subtraction?
+        PHOTOMETRY      BOOL    TRUE    # Perform photometry?
+        NOCONVOLVE      BOOL    TRUE
+        CONVOLVE.TARGET STR     SINGLE2 # convolution direction
+END
+              
 
 # Gene's choice: multiplying by 1.75

trunk/ippconfig/recipes/reductionClasses.mdc

@@ -174 +174 @@
 END
 
+# Use 1D Gaussian convolutions
+DEFAULT_1DG             METADATA
+        CHIP_PPIMAGE      STR     CHIP
+        CHIP_PSPHOT       STR     CHIP
+        WARP_PSWARP       STR     WARP
+        STACK_PPSTACK     STR     STACK_1DG
+        STACK_PPSUB       STR     STACK_1DG
+        STACK_PSPHOT      STR     STACK
+        DIFF_PPSUB        STR     DIFF_1DG
+        DIFF_PSPHOT       STR     DIFF
+        JPEG_BIN1         STR     PPIMAGE_J1
+        JPEG_BIN2         STR     PPIMAGE_J2
+        FAKEPHOT          STR     FAKEPHOT
+        ADDSTAR           STR     ADDSTAR
+        PSASTRO           STR     DEFAULT_RECIPE
+        STACKPHOT_PSPHOT  STR     STACKPHOT
+        STACKPHOT_PPSUB   STR     STACKPHOT_1DG
+        STACKPHOT_PPSTACK STR     STACKPHOT_1DG
+        STACKPHOT_SINGLE_PSPHOT  STR    STACKPHOT_SINGLE
+        BACKGROUND_PPBACKGROUND STR     BACKGROUND
+        BACKGROUND_PSWARP       STR     BACKGROUND
+        PSVIDEOPHOT             STR     PSVIDEOPHOT
+        STATICSKY_CALIBRATION   STR     STATICSKY_CAL
+END
+
 
 
@@ -268 +293 @@
         STACKPHOT_PSPHOT  STR     STACKPHOT
         STACKPHOT_PPSUB   STR     STACKPHOT
+        STACKPHOT_PPSTACK STR     STACKPHOT
+        STACKPHOT_SINGLE_PSPHOT  STR     STACKPHOT_SINGLE
+        BACKGROUND_PPBACKGROUND STR     BACKGROUND
+        BACKGROUND_PSWARP       STR     BACKGROUND
+        PSVIDEOPHOT             STR     PSVIDEOPHOT
+END
+
+SWEETSPOT_1DG           METADATA
+        CHIP_PPIMAGE      STR     CHIP
+        CHIP_PSPHOT       STR     CHIP
+        WARP_PSWARP       STR     WARP
+        STACK_PPSTACK     STR     QUICKSTACK
+        STACK_PPSUB       STR     STACK_1DG
+        STACK_PSPHOT      STR     STACK
+        DIFF_PPSUB        STR     DIFF_1DG
+        DIFF_PSPHOT       STR     SSTF_DIFF
+        JPEG_BIN1         STR     PPIMAGE_J1
+        JPEG_BIN2         STR     PPIMAGE_J2
+        FAKEPHOT          STR     FAKEPHOT
+        ADDSTAR           STR     ADDSTAR
+        PSASTRO           STR     DEFAULT_RECIPE
+        STACKPHOT_PSPHOT  STR     STACKPHOT
+        STACKPHOT_PPSUB   STR     STACKPHOT_1DG
         STACKPHOT_PPSTACK STR     STACKPHOT
         STACKPHOT_SINGLE_PSPHOT  STR     STACKPHOT_SINGLE