Changeset 35532

Timestamp:

May 8, 2013, 11:07:19 AM (13 years ago)

Author:

bills

Message:

From trunk - merge in implementatin of auxiliary masking

Location:

tags/ipp-20130307

Files:

• ippconfig/gpc1/ppImage.config (modified) (6 diffs, 1 prop)
• ippconfig/recipes/ppImage.config (modified) (2 diffs, 1 prop)
• ippconfig/recipes/reductionClasses.mdc (modified) (4 diffs, 1 prop)
• ppImage (modified) (1 prop)
• ppImage/src (modified) (1 prop)
• ppImage/src/Makefile.am (modified) (1 diff)
• ppImage/src/ppImage.h (modified) (3 diffs)
• ppImage/src/ppImageAuxiliaryMask.c (copied) (copied from trunk/ppImage/src/ppImageAuxiliaryMask.c )
• ppImage/src/ppImageDetrendReadout.c (modified) (1 diff)
• ppImage/src/ppImageLoop.c (modified) (1 diff)
• ppImage/src/ppImageOptions.c (modified) (4 diffs)
• psModules/src/detrend (modified) (1 prop)
• psModules/src/detrend/pmDetrendDB.c (modified) (1 diff)
• psModules/src/detrend/pmDetrendDB.h (modified) (1 diff)

tags/ipp-20130307/ippconfig/gpc1/ppImage.config

@@ -30 +30 @@
 USE.VIDEO.MASK  BOOL    TRUE            # Use a video mask if we have video data?
 
+# aditional auxillary mask applied to corners of all chips in video cells.
+# Is only applied if MASK.AUXMASK and USE.VIDEO.MASK are both true
+AUX.VIDEO.MASK  STR     neb://any/gpc1/auxmask/mpg.20130506/mask_video_cell_corners.fits
 
 
@@ -150 +153 @@
 FRINGE.FILTERS  STR y.00000
 
-# Standard chip processing
+# Standard chip processing (NOTE: when changing this be sure to check whether changes should be applied toCHIP_BGPRESEVE and/or CHIP_AUXMASK
 CHIP METADATA
   BASE.FITS          BOOL    FALSE           # Save base detrended image?
@@ -169 +172 @@
   MASK.BUILD         BOOL    TRUE            # Build internal mask?
   MASK.BURNTOOL      BOOL    TRUE            # Mask potential burntool trails
+  MASK.AUXMASK       BOOL    FALSE           # augment with more restrictive auxillary mask
   PATTERN.ROW        BOOL    TRUE            # Row pattern correction
   PATTERN.CELL       BOOL    FALSE           # Cell pattern correction
@@ -1220 +1224 @@
 END
 
-# Standard chip processing without any background removal
-CHIP_PRESERVE_BG        METADATA
+# Standard chip processing + auxillary mask
+CHIP_AUXMASK METADATA
   BASE.FITS          BOOL    FALSE           # Save base detrended image?
   BASE.MASK.FITS     BOOL    FALSE           # Save base detrended image?
@@ -1232 +1236 @@
   BIAS               BOOL    FALSE           # Bias subtraction
   DARK               BOOL    TRUE            # Dark subtraction
+  NOISEMAP           BOOL    TRUE            
   REMNANCE           BOOL    FALSE           # Remnance masking
   SHUTTER            BOOL    FALSE           # Shutter correction
@@ -1238 +1243 @@
   MASK.BUILD         BOOL    TRUE            # Build internal mask?
   MASK.BURNTOOL      BOOL    TRUE            # Mask potential burntool trails
+  MASK.AUXMASK       BOOL    TRUE            # augment with more restrictive auxillary mask
+  PATTERN.ROW        BOOL    TRUE            # Row pattern correction
+  PATTERN.CELL       BOOL    FALSE           # Cell pattern correction
+  PATTERN.CONTINUITY BOOL    TRUE            # Cell pattern correction using edge continuity
+  FRINGE             BOOL    TRUE            # Fringe subtraction
+  BIN1.FITS          BOOL    TRUE            # Save 1st binned chip image?
+  BIN2.FITS          BOOL    TRUE            # Save 2nd binned chip image?
+  PHOTOM             BOOL    TRUE            # Source identification and photometry
+  ASTROM.CHIP        BOOL    FALSE           # Astrometry per chip?
+  ASTROM.MOSAIC      BOOL    FALSE           # Astrometry for mosaic?
+  BACKGROUND         BOOL    TRUE            # Subtract background?
+  CROSSTALK.MEASURE  BOOL    TRUE            # Subtract model background?
+END
+
+# Standard chip processing without any background removal
+CHIP_PRESERVE_BG        METADATA
+  BASE.FITS          BOOL    FALSE           # 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    TRUE            # Save chip-mosaic-ed image? 
+  CHIP.MASK.FITS     BOOL    TRUE            # Save chip-mosaic-ed image? 
+  CHIP.VARIANCE.FITS BOOL    TRUE            # Save chip-mosaic-ed image? 
+  OVERSCAN           BOOL    TRUE            # Overscan subtraction
+  NONLIN             BOOL    TRUE            # apply non-linearity correction 
+  BIAS               BOOL    FALSE           # Bias subtraction
+  DARK               BOOL    TRUE            # Dark subtraction
+  NOISEMAP           BOOL    FALSE
+  REMNANCE           BOOL    FALSE           # Remnance masking
+  SHUTTER            BOOL    FALSE           # Shutter correction
+  FLAT               BOOL    TRUE            # Flat-field normalisation
+  MASK               BOOL    TRUE            # Mask bad pixels
+  MASK.BUILD         BOOL    TRUE            # Build internal mask?
+  MASK.BURNTOOL      BOOL    TRUE            # Mask potential burntool trails
+  MASK.AUXMASK       BOOL    TRUE            # augment with more restrictive auxillary mask
   PATTERN.ROW        BOOL    FALSE           # Row pattern correction
   PATTERN.CELL       BOOL    FALSE           # Cell pattern correction

tags/ipp-20130307/ippconfig/recipes/ppImage.config

@@ -17 +17 @@
 MASK.LOW           BOOL    TRUE            # Mask pixels below valid range
 MASK.BURNTOOL      BOOL    FALSE           # Mask potential burntool trails
+MASK.AUXMASK       BOOL    FALSE           # augment mask with auxillary mask
+AUX.VIDEO.MASK     STR     NULL
 VARIANCE.BUILD     BOOL    FALSE           # Build internal variance image
 ADDNOISE           BOOL    FALSE           # Add noise to degrade an MD image to a 3pi image?
@@ -168 +170 @@
 # Standard chip processing
 CHIP    METADATA
+  BASE.FITS          BOOL    FALSE           # 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    TRUE            # Save chip-mosaic-ed image? 
+  CHIP.MASK.FITS     BOOL    TRUE            # Save chip-mosaic-ed image? 
+  CHIP.VARIANCE.FITS BOOL    TRUE            # Save chip-mosaic-ed image? 
+  OVERSCAN           BOOL    TRUE            # Overscan subtraction
+  NONLIN             BOOL    FALSE           # Non-linearity correction; not implemented
+  BIAS               BOOL    TRUE            # Bias subtraction
+  DARK               BOOL    TRUE            # Dark subtraction
+  SHUTTER            BOOL    FALSE           # Shutter correction
+  FLAT               BOOL    TRUE            # Flat-field normalisation
+  MASK               BOOL    TRUE            # Mask bad pixels
+  FRINGE             BOOL    TRUE            # Fringe subtraction
+  BIN1.FITS          BOOL    TRUE            # Save 1st binned chip image?
+  BIN2.FITS          BOOL    TRUE            # Save 2nd binned chip image?
+  PHOTOM             BOOL    TRUE            # Source identification and photometry
+  ASTROM.CHIP        BOOL    FALSE           # Astrometry per chip?
+  ASTROM.MOSAIC      BOOL    FALSE           # Astrometry for mosaic?
+  BACKGROUND         BOOL    TRUE            # Subtract background?
+  MASK.STATS         BOOL    TRUE            # Calculate Mask statistics.
+END
+
+# Standard chip processing
+CHIP_AUXMASK    METADATA
   BASE.FITS          BOOL    FALSE           # Save base detrended image?
   BASE.MASK.FITS     BOOL    FALSE           # Save base detrended image?

tags/ipp-20130307/ippconfig/recipes/reductionClasses.mdc

@@ -538 +538 @@
 END
 
+THREEPI_STACK_ALT     METADATA
+      STACK_PPSTACK   STR      STACK_THREEPI_ALT
+      STACK_PPSUB     STR      STACK
+      STACK_PSPHOT    STR      STACK
+END
+
+
 # quick stacks
 QUICKSTACK            METADATA
@@ -632 +639 @@
 PRESERVE_BG     METADATA
         CHIP_PPIMAGE    STR     CHIP_PRESERVE_BG
+        CHIP_PSPHOT     STR     CHIP
+        WARP_PSWARP     STR     WARP
+        STACK_PPSTACK   STR     STACK
+        STACK_PPSUB     STR     STACK
+        STACK_PSPHOT    STR     STACK
+        DIFF_PPSUB      STR     DIFF
+        DIFF_PSPHOT     STR     DIFF
+        JPEG_BIN1       STR     PPIMAGE_J1
+        JPEG_BIN2       STR     PPIMAGE_J2
+        FAKEPHOT        STR     FAKEPHOT
+        ADDSTAR         STR     ADDSTAR
+        PSASTRO         STR     DEFAULT_RECIPE
+        BACKGROUND_PPBACKGROUND STR     BACKGROUND
+        BACKGROUND_PSWARP       STR     BACKGROUND
+END
+
+# Background removal, but then add it back in
+RESTORE_BG      METADATA
+        CHIP_PPIMAGE    STR     CHIP_RESTORE_BG
         CHIP_PSPHOT     STR     CHIP
         WARP_PSWARP     STR     WARP
@@ -981 +1007 @@
 
 STS_DATASET METADATA
-   CHIP_PPIMAGE STR CHIP
+   CHIP_PPIMAGE STR CHIP_AUXMASK
    CHIP_PSPHOT STR CHIP
    WARP_PSWARP STR WARP
@@ -997 +1023 @@
 END
 
+M31_DATASET             METADATA
+        CHIP_PPIMAGE      STR     CHIP_AUXMASK
+        CHIP_PSPHOT       STR     CHIP
+        WARP_PSWARP       STR     WARP
+        STACK_PPSTACK     STR     STACK
+        STACK_PPSUB       STR     STACK
+        STACK_PSPHOT      STR     STACK
+        DIFF_PPSUB        STR     DIFF
+        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
+        STACKPHOT_PPSTACK STR     STACKPHOT
+        STACKPHOT_SINGLE_PSPHOT  STR     STACKPHOT_SINGLE
+        BACKGROUND_PPBACKGROUND STR     BACKGROUND
+        BACKGROUND_PSWARP       STR     BACKGROUND
+        PSVIDEOPHOT             STR     PSVIDEOPHOT
+        STATICSKY_CALIBRATION   STR     STATICSKY_CAL
+END
+
 CNP_DATASET     METADATA
         CHIP_PPIMAGE      STR     CHIP

tags/ipp-20130307/ppImage/src/Makefile.am

@@ -65 +65 @@
         ppImageMemory.c \
         ppImageAddNoise.c \
-        ppImageRandomGaussian.c
+        ppImageRandomGaussian.c \
+        ppImageAuxiliaryMask.c
 
 CLEANFILES = *~

tags/ipp-20130307/ppImage/src/ppImage.h

@@ -30 +30 @@
     bool doMaskLow;                     // mask low pixels
     bool doMask;                        // Mask bad pixels
+    bool doAuxMask;                     // apply auxillary mask
     bool doNonLin;                      // Non-linearity correction
     bool doOverscan;                    // Overscan subtraction
@@ -126 +127 @@
   psU16 maskstat_magic;
   psU16 maskstat_advisory;
+
+  psString auxVideoMask;                // auxillary video mask file
   
 } ppImageOptions;
@@ -312 +315 @@
 void ppImageRandomGaussianFree(void);
 
+bool ppImageAuxiliaryMask(pmConfig *config, const pmFPAview *view, const ppImageOptions *options);
 
 #endif

tags/ipp-20130307/ppImage/src/ppImageDetrendReadout.c

@@ -50 +50 @@
         char *Vptr = strchr(psMetadataLookupStr(NULL,input->parent->parent->hdu->header,"CELLMODE"),'V');
         if (Vptr) {
-          hasVideo = true;
+          hasVideo = options->hasVideo = true;
           psLogMsg ("ppImage.detrend", PS_LOG_INFO, "VIDEO: %d %d %d\n",(int) options->hasVideo,(int) options->useVideoDark, (int) options->useVideoMask);
         }

tags/ipp-20130307/ppImage/src/ppImageLoop.c

@@ -188 +188 @@
             ESCAPE("Unable to mosaic chip");
         }
+
+        if (!ppImageAuxiliaryMask(config, view, options)) {
+            ESCAPE("Unable to apply auxiliary mask");
+        }
+
         timeDetrend += psTimerClear(TIMER_DETREND);
 

tags/ipp-20130307/ppImage/src/ppImageOptions.c

@@ -10 +10 @@
     // psFree(options->nonLinearData);
     // psFree(options->nonLinearSource);
+    psFree(options->auxVideoMask);
 }
 
@@ -24 +25 @@
     options->doVarianceBuild = false;   // Build internal variance
     options->doMask          = false;   // Mask bad pixels
+    options->doAuxMask       = false;   // apply auxillary mask
     options->doNonLin        = false;   // Non-linearity correction
     options->doOverscan      = false;   // Overscan subtraction
@@ -116 +118 @@
     options->normClass       = NULL;    // per-class normalizations refer to this class
 
+    options->auxVideoMask    = NULL;    // auxillary video mask file name
+
     return options;
 }
@@ -228 +232 @@
     options->doMaskBurntool  = psMetadataLookupBool(NULL, recipe, "MASK.BURNTOOL");
     options->doVarianceBuild = psMetadataLookupBool(NULL, recipe, "VARIANCE.BUILD");
+    options->doAuxMask       = psMetadataLookupBool(NULL, recipe, "MASK.AUXMASK");
+    if (options->doAuxMask) {
+        // if we are applying an auxiliary mask we can optionally apply another
+        // mask to video cells only. 
+        psString auxVideoMask = psMetadataLookupStr(NULL, recipe, "AUX.VIDEO.MASK");
+        // save the value if defined and not the value "NULL"
+        if (auxVideoMask && strcmp(auxVideoMask, "NULL")) {
+            options->auxVideoMask = psStringCopy(auxVideoMask);
+        }
+    }
 
     // Mask recipe options (note that mask bit values are set in ppImageSetMaskBits.c)

tags/ipp-20130307/psModules/src/detrend/pmDetrendDB.c

@@ -110 +110 @@
         DETREND_STRING_CASE(VIDEODARK);
         DETREND_STRING_CASE(LINEARITY);
+        DETREND_STRING_CASE(AUXMASK);
     default:
         return NULL;

tags/ipp-20130307/psModules/src/detrend/pmDetrendDB.h

@@ -39 +39 @@
     PM_DETREND_TYPE_VIDEODARK,
     PM_DETREND_TYPE_LINEARITY,
+    PM_DETREND_TYPE_AUXMASK,
 } pmDetrendType;