Changeset 30419

Timestamp:

Jan 28, 2011, 3:13:28 PM (15 years ago)

Author:

watersc1

Message:

finished with logflux code, but haven't run any tests to confirm that the new stacking recipes work as designed.

Location:

branches/czw_branch/20101203

Files:

• ippScripts/scripts/stack_skycell.pl (modified) (2 diffs)
• ippconfig/gpc1/ppStack.config (modified) (1 diff)
• ippconfig/recipes/ppStack.config (modified) (1 diff)
• ippconfig/recipes/reductionClasses.mdc (modified) (1 diff)
• psLib/src/fits/psFits.h (modified) (2 diffs)
• psLib/src/fits/psFitsImage.c (modified) (2 diffs)
• psLib/src/fits/psFitsScale.c (modified) (3 diffs)
• psModules/src/camera/pmFPAfileDefine.c (modified) (1 diff)

branches/czw_branch/20101203/ippScripts/scripts/stack_skycell.pl

@@ -172 +172 @@
 my $photometry = metadataLookupBool($recipe, 'PHOTOMETRY'); # perform photometry?
 my $output_nocomp = metadataLookupBool($recipe, 'OUTPUT.NOCOMP'); # change filerules to produced uncompressed output images
-
+my $output_logflux = metadataLookupBool($recipe, 'OUTPUT.LOGFLUX'); # change filerules to produce logflux compressed output images.
+
+if ($output_nocomp and $output_logflux) {
+    &my_die("Unable to not compress and logflux compress simultaneously. Check config.",$stack_id, $PS_EXIT_CONFIG_ERROR);
+}
 
 # Generate MDC file with the inputs
@@ -252 +256 @@
         $command .= " -F PPSTACK.UNCONV.EXPWT PPSTACK.UNCONV.EXPWT.NOCOMP";
     }
+    if ($output_logflux) {
+        $command .= " -R PPSTACK.OUTPUT FITS.TYPE COMP_STACK "; # Just this one output component?
+        $command .= " -R PPSTACK.OUTPUT.VARIANCE FITS.TYPE COMP_STACK "; 
+        $command .= " -R PPSTACK.OUTPUT.EXPWT FITS.TYPE COMP_STACK ";
+        $command .= " -R PPSTACK.UNCONV FITS.TYPE COMP_STACK ";
+        $command .= " -R PPSTACK.UNCONV.VARIANCE FITS.TYPE COMP_STACK ";
+        $command .= " -R PPSTACK.UNCONV.EXPWT FITS.TYPE COMP_STACK ";
+    }
     $command .= " -threads $threads" if defined $threads;
     $command .= " -debug-stack" if defined $debug;

branches/czw_branch/20101203/ippconfig/gpc1/ppStack.config

@@ -20 +20 @@
 PS1_REFERENCE METADATA
     OUTPUT.NOCOMP   BOOL    TRUE
+    OUTPUT.LOGFLUX  BOOL    FALSE
 END
+
+STACK_DEEP    METADATA
+    OUTPUT.NOCOMP   BOOL    TRUE
+    OUTPUT.LOGFLUX  BOOL    FALSE
+END
+
+STACK_NIGHTLY  METADATA
+    OUTPUT.NOCOMP   BOOL    FALSE
+    OUTPUT.LOGFLUX  BOOL    FALSE
+END
+
+STACK_THREEPI  METADATA
+    OUTPUT.NOCOMP   BOOL    FALSE
+    OUTPUT.LOGFLUX  BOOL    TRUE
+END

branches/czw_branch/20101203/ippconfig/recipes/ppStack.config

@@ -112 +112 @@
         PHOTOMETRY          BOOL  FALSE           # Do basic photometry?
 END
+
+
+# 
+
+STACK_DEEP    METADATA
+END
+
+STACK_NIGHTLY  METADATA
+END
+
+STACK_THREEPI  METADATA
+END

branches/czw_branch/20101203/ippconfig/recipes/reductionClasses.mdc

@@ -192 +192 @@
         JPEG_BIN1       STR     PPIMAGE_J1
         JPEG_BIN2       STR     PPIMAGE_J2
+END
+
+# reduction classes for different stacks
+# regular stacks
+NIGHTLY_STACK         METADATA
+      STACK_PPSTACK   STR      STACK_NIGHTLY
+      STACK_PPSUB     STR      STACK
+      STACK_PSPHOT    STR      STACK
+END
+
+# deep stacks
+DEEP_STACK            METADATA
+      STACK_PPSTACK   STR      STACK_DEEP
+      STACK_PPSUB     STR      STACK
+      STACK_PSPHOT    STR      STACK
+END
+
+# three pi stacks
+THREEPI_STACK         METADATA
+      STACK_PPSTACK   STR      STACK_THREEPI
+      STACK_PPSUB     STR      STACK
+      STACK_PSPHOT    STR      STACK
 END
 

branches/czw_branch/20101203/psLib/src/fits/psFits.h

@@ -50 +50 @@
     PS_FITS_SCALE_STDEV_NEGATIVE,       ///< Auto-scale to sample stdev, place mean at upper limit
     PS_FITS_SCALE_STDEV_BOTH,           ///< Auto-scale to sample stdev, place mean at middle
+    PS_FITS_SCALE_MANUAL,                ///< Manual scaling (use specified BSCALE and BZERO)
     PS_FITS_SCALE_LOG_RANGE,            ///< Take logarithm, Auto-scale to preserve dynamic range
     PS_FITS_SCALE_LOG_STDEV_POSITIVE,   ///< Take logarithm, Auto-scale to sample stdev, place mean at lower limit
     PS_FITS_SCALE_LOG_STDEV_NEGATIVE,   ///< Take logarithm, Auto-scale to sample stdev, place mean at upper limit
     PS_FITS_SCALE_LOG_STDEV_BOTH,       ///< Take logarithm, Auto-scale to sample stdev, place mean at middle
-
-    PS_FITS_SCALE_MANUAL                ///< Manual scaling (use specified BSCALE and BZERO)
+    PS_FITS_SCALE_LOG_MANUAL            ///< Manual scaling (use specified BSCALE, BZERO, and BOFFSET)
 } psFitsScaling;
 
@@ -71 +71 @@
     bool fuzz;                          ///< Fuzz the values when quantising floating-point values?
     double bscale, bzero;               ///< Manually specified BSCALE and BZERO (for SCALE_MANUAL)
+    double boffset;                     ///< Manually specified BOFFSET (for SCALE_MANUAL)
     double mean, stdev;                 ///< Mean and standard deviation of image
     int stdevBits;                      ///< Number of bits to sample a standard deviation (for SCALE_STDEV_*)

branches/czw_branch/20101203/psLib/src/fits/psFitsImage.c

@@ -692 +692 @@
     // Remove any BOFFSET values that exist in the header if we are not using that scaling anymore
     if (options&&(!((options->scaling == PS_FITS_SCALE_LOG_RANGE)||
+                    (options->scaling == PS_FITS_SCALE_LOG_MANUAL)||
                    (options->scaling == PS_FITS_SCALE_LOG_STDEV_POSITIVE)||
                    (options->scaling == PS_FITS_SCALE_LOG_STDEV_NEGATIVE)||
@@ -718 +719 @@
                            "Scaling: TRUE = BZERO + BSCALE * DISK", &status);
         if (options&&(((options->scaling == PS_FITS_SCALE_LOG_RANGE)||
+                       (options->scaling == PS_FITS_SCALE_LOG_MANUAL)||
                        (options->scaling == PS_FITS_SCALE_LOG_STDEV_POSITIVE)||
                        (options->scaling == PS_FITS_SCALE_LOG_STDEV_NEGATIVE)||

branches/czw_branch/20101203/psLib/src/fits/psFitsScale.c

@@ -539 +539 @@
         *bzero = options->bzero;
         break;
+      case PS_FITS_SCALE_LOG_MANUAL:
+        *bscale = options->bscale;
+        *bzero = options->bzero;
+        *boffset = options->boffset;
+        break;
       default:
         psError(PS_ERR_BAD_PARAMETER_VALUE, true, "Unrecognised FITS scaling method: %x",
@@ -616 +621 @@
               ps##INTYPE value; \
               if ((options->scaling == PS_FITS_SCALE_LOG_RANGE)||       \
+                (options->scaling == PS_FITS_SCALE_LOG_MANUAL)||        \
                   (options->scaling == PS_FITS_SCALE_LOG_STDEV_POSITIVE)|| \
                   (options->scaling == PS_FITS_SCALE_LOG_STDEV_NEGATIVE)|| \
@@ -756 +762 @@
     if (strcasecmp(string, "STDEV_BOTH") == 0)     return PS_FITS_SCALE_STDEV_BOTH;
     if (strcasecmp(string, "LOG_RANGE") == 0)      return PS_FITS_SCALE_LOG_RANGE;
+    if (strcasecmp(string, "LOG_MANUAL") == 0)      return PS_FITS_SCALE_LOG_MANUAL;
     if (strcasecmp(string, "LOG_STDEV_POSITIVE") == 0) return PS_FITS_SCALE_LOG_STDEV_POSITIVE;
     if (strcasecmp(string, "LOG_STDEV_NEGATIVE") == 0) return PS_FITS_SCALE_LOG_STDEV_NEGATIVE;

branches/czw_branch/20101203/psModules/src/camera/pmFPAfileDefine.c

@@ -312 +312 @@
                 options->bzero = parseOptionDouble(scheme, "BZERO", source); // Zero point
                 break;
+            case PS_FITS_SCALE_LOG_MANUAL:
+              options->bscale = parseOptionDouble(scheme, "BSCALE", source); // Scaling
+              options->bzero = parseOptionDouble(scheme, "BZERO", source); // Zero point
+              options->boffset = parseOptionDouble(scheme, "BOFFSET", source); // Log offset
+              break;          
               default:
                 psAbort("Should never get here.");