Changeset 17231 for trunk/ippconfig/isp/camera.config

Timestamp:

Mar 28, 2008, 5:21:54 PM (18 years ago)

Author:

Paul Price

Message:

Merging in pap_branch_080328 --- modernised ppMerge.

File:

• trunk/ippconfig/isp/camera.config (modified) (2 diffs)

trunk/ippconfig/isp/camera.config

@@ -214 +214 @@
    PPIMAGE.SHUTTER    INPUT @DETDB        FPA        IMAGE     
 
+   ## Files used by ppMerge
+   PPMERGE.INPUT      INPUT @FILES        CHIP       IMAGE
+   PPMERGE.INPUT.MASK INPUT @FILES        CHIP       MASK
+   PPMERGE.INPUT.WEIGHT INPUT @FILES      CHIP       WEIGHT
+
    ## files used to build and apply the flat-field correction images
    DVOCORR.INPUT      INPUT @FILES        FPA        IMAGE
@@ -259 +264 @@
    PPIMAGE.JPEG2         OUTPUT  {OUTPUT}.b2.jpg      JPEG      NONE      FPA        TRUE      NONE
 
-   PPMERGE.OUTPUT        OUTPUT  {OUTPUT}.fits        IMAGE     NONE      FPA        TRUE      NONE
+   PPMERGE.OUTPUT.MASK   OUTPUT {OUTPUT}.fits         MASK      NONE      CHIP       TRUE      NONE
+   PPMERGE.OUTPUT.BIAS   OUTPUT {OUTPUT}.fits         IMAGE     NONE      CHIP       TRUE      NONE
+   PPMERGE.OUTPUT.DARK   OUTPUT {OUTPUT}.fits         DARK      NONE      CHIP       TRUE      NONE
+   PPMERGE.OUTPUT.SHUTTER OUTPUT {OUTPUT}.fits        IMAGE     NONE      CHIP       TRUE      NONE
+   PPMERGE.OUTPUT.FLAT   OUTPUT {OUTPUT}.fits         IMAGE     NONE      CHIP       TRUE      NONE
+   PPMERGE.OUTPUT.FRINGE OUTPUT {OUTPUT}.fits         FRINGE    NONE      CHIP       TRUE      NONE
+   PPMERGE.OUTPUT.SIGMA  OUTPUT {OUTPUT}.sigma.fits   IMAGE     NONE      CHIP       TRUE      NONE
+   PPMERGE.OUTPUT.COUNT  OUTPUT {OUTPUT}.count.fits   IMAGE     NONE      CHIP       TRUE      NONE
 
    DVOCORR.OUTPUT        OUTPUT  {OUTPUT}.fc.fits     IMAGE     NONE      FPA        TRUE      NONE