Changeset 13760

Timestamp:

Jun 11, 2007, 2:33:30 PM (19 years ago)

Author:

eugene

Message:

setting fringe jpeg scaling

Location:

trunk

Files:

• ippScripts/scripts/detrend_norm_exp.pl (modified) (2 diffs)
• ippScripts/scripts/detrend_process_exp.pl (modified) (2 diffs)
• ippconfig/recipes/ppImage.config (modified) (3 diffs)

trunk/ippScripts/scripts/detrend_norm_exp.pl

@@ -66 +66 @@
         'domeflat' => 'PPIMAGE_J1_IMAGE_F',     # Flat-field only
         'skyflat'  => 'PPIMAGE_J1_IMAGE_F',     # Flat-field only
-        'fringe'   => 'PPIMAGE_J1_IMAGE_F',     # Fringe only
+        'fringe'   => 'PPIMAGE_J1_IMAGE_R',     # Fringe only
     },
     'bin2' => {         # We're checking the master --- input is not already processed
@@ -75 +75 @@
         'domeflat' => 'PPIMAGE_J2_IMAGE_F',     # Flat-field only
         'skyflat'  => 'PPIMAGE_J2_IMAGE_F',     # Flat-field only
-        'fringe'   => 'PPIMAGE_J2_IMAGE_F',     # Fringe only
+        'fringe'   => 'PPIMAGE_J2_IMAGE_R',     # Fringe only
     },
 };

trunk/ippScripts/scripts/detrend_process_exp.pl

@@ -66 +66 @@
         'domeflat' => 'PPIMAGE_J1_IMAGE_F',     # Flat-field only
         'skyflat'  => 'PPIMAGE_J1_IMAGE_F',     # Flat-field only
-        'fringe'   => 'PPIMAGE_J1_IMAGE_F',     # Fringe only
+        'fringe'   => 'PPIMAGE_J1_IMAGE_R',     # Fringe only
     },
     'bin2' => {         # We're checking the master --- input is not already processed
@@ -75 +75 @@
         'domeflat' => 'PPIMAGE_J2_IMAGE_F',     # Flat-field only
         'skyflat'  => 'PPIMAGE_J2_IMAGE_F',     # Flat-field only
-        'fringe'   => 'PPIMAGE_J2_IMAGE_F',     # Fringe only
+        'fringe'   => 'PPIMAGE_J2_IMAGE_R',     # Fringe only
     },
 };

trunk/ippconfig/recipes/ppImage.config

@@ -525 +525 @@
     COLORMAP      STR     -greyscale
     SCALE.MODE    STR     RANGE
-    SCALE.MIN     F32     -3.0
+    SCALE.MIN     F32     -2.0
     SCALE.MAX     F32     +3.0
   END
@@ -551 +551 @@
   PPIMAGE.JPEG2  METADATA
     COLORMAP      STR     -greyscale
-    SCALE.MODE    STR     FRACTION
-    SCALE.MIN     F32     0.95
-    SCALE.MAX     F32     1.05
+    SCALE.MODE    STR     RANGE
+    SCALE.MIN     F32     -2.0
+    SCALE.MAX     F32     +3.0
   END
 END
@@ -666 +666 @@
 END
 
+# Save JPEG from BIN1 for flat
+PPIMAGE_J1_IMAGE_R      METADATA
+  OVERSCAN        BOOL    FALSE           # Overscan subtraction
+  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
+  FRINGE          BOOL    FALSE           # Fringe subtraction
+  BASE.FITS       BOOL    FALSE           # Save base image?
+  BIN1.FITS       BOOL    FALSE           # Save 1st binned chip image?
+  BIN2.FITS       BOOL    FALSE           # Save 2nd binned chip image?
+  BIN1.JPEG       BOOL    TRUE            # Save 1st binned jpeg?
+  BIN2.JPEG       BOOL    FALSE           # Save 2nd binned jpeg?
+  BIN1.XBIN       S32     1               # Image is already binned
+  BIN1.YBIN       S32     1               # Image is already binned
+  BIN2.XBIN       S32     1               # Image is already binned
+  BIN2.YBIN       S32     1               # Image is already binned
+
+  PPIMAGE.JPEG1  METADATA
+    COLORMAP      STR     -greyscale
+    SCALE.MODE    STR     RANGE
+    SCALE.MIN     F32     -2.0
+    SCALE.MAX     F32     +3.0
+  END
+END
+
+# Save JPEG from BIN2 for flat
+PPIMAGE_J2_IMAGE_R        METADATA
+  OVERSCAN        BOOL    FALSE           # Overscan subtraction
+  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
+  FRINGE          BOOL    FALSE           # Fringe subtraction
+  BASE.FITS       BOOL    FALSE           # Save base image?
+  BIN1.FITS       BOOL    FALSE           # Save 1st binned chip image?
+  BIN2.FITS       BOOL    FALSE           # Save 2nd binned chip image?
+  BIN1.JPEG       BOOL    FALSE           # Save 1st binned jpeg?
+  BIN2.JPEG       BOOL    TRUE            # Save 2nd binned jpeg?
+  BIN1.XBIN       S32     1               # Image is already binned
+  BIN1.YBIN       S32     1               # Image is already binned
+  BIN2.XBIN       S32     1               # Image is already binned
+  BIN2.YBIN       S32     1               # Image is already binned
+
+  PPIMAGE.JPEG2  METADATA
+    COLORMAP      STR     -greyscale
+    SCALE.MODE    STR     RANGE
+    SCALE.MIN     F32     -2.0
+    SCALE.MAX     F32     +3.0
+  END
+END
+