Changeset 34073 for branches/eam_branches/ipp-20120601/ippconfig

Timestamp:

Jun 25, 2012, 5:25:53 PM (14 years ago)

Author:

eugene

Message:

merge changes from trunk

Location:

branches/eam_branches/ipp-20120601

Files:

• . (modified) (1 prop)
• ippconfig (modified) (1 prop)
• ippconfig/gpc1/ppImage.config (modified) (3 diffs)
• ippconfig/recipes/nightly_science.config (modified) (1 diff)
• ippconfig/recipes/ppImage.config (modified) (2 diffs)
• ippconfig/recipes/reductionClasses.mdc (modified) (1 prop)

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

@@ -278 +278 @@
    OVERSCAN           BOOL    TRUE            # Overscan subtraction
    NONLIN             BOOL    TRUE            # Non-linearity correction; not implemented
+   NOISEMAP           BOOL    TRUE
    BIAS               BOOL    FALSE           # Bias subtraction
    DARK               BOOL    TRUE            # Dark subtraction
@@ -287 +288 @@
    MASK.BURNTOOL      BOOL    TRUE            # Mask potential burntool trails
    PATTERN.ROW        BOOL    TRUE            # Row pattern correction
-   PATTERN.CELL       BOOL    TRUE            # Cell 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?
@@ -305 +307 @@
        DETTYPE STR MASKTEST
      END   
+     VIDEOMASK METADATA
+       DETTYPE STR VIDEOMASKTEST
+     END
      FLAT METADATA
        FILTER  STR FPA.FILTERID

branches/eam_branches/ipp-20120601/ippconfig/recipes/nightly_science.config

@@ -7 +7 @@
 CLEAN_MODES METADATA
   MODE           STR WARP
-  COMMAND        STR warptool -dbname @DBNAME@ -updaterun -set_state goto_cleaned -state full -set_label goto_cleaned -label @LABEL@ -data_group @DATA_GROUP@
+#  COMMAND        STR warptool -dbname @DBNAME@ -updaterun -set_state goto_cleaned -state full -set_label goto_cleaned -label @LABEL@ -data_group @DATA_GROUP@
+  COMMAND        STR true
   RETENTION_TIME U16 7
 END

branches/eam_branches/ipp-20120601/ippconfig/recipes/ppImage.config

@@ -221 +221 @@
 
 CHIP_MASKTEST 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?
+  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.
  
    DETREND.CONSTRAINTS  METADATA
@@ -249 +250 @@
      MASK METADATA
        DETTYPE STR MASKTEST
-     END   
+     END
+     VIDEOMASK METADATA
+       DETTYPE STR VIDEOMASKTEST
+     END  
    END   
 END