Changeset 23740 for trunk/ppSub/src/ppSubBackground.c

Timestamp:

Apr 7, 2009, 4:50:25 PM (17 years ago)

Author:

Paul Price

Message:

Merging branches/pap from r23739 onto trunk. No conflicts, ppSub builds fine.

Location:

trunk

Files:

• . (modified) (1 prop)
• ppSub (modified) (1 prop)
• ppSub/src (modified) (1 prop)
• ppSub/src/ppSubBackground.c (modified) (4 diffs)

trunk/ppSub/src

@@ -10 +10 @@
 stamp-h1
 ppSubKernel
+ppSubErrorCodes.h
+ppSubErrorCodes.c

@@ -10 +10 @@
 stamp-h1
 ppSubKernel
+ppSubErrorCodes.h
+ppSubErrorCodes.c

trunk/ppSub/src/ppSubBackground.c

@@ -22 +22 @@
 #include "ppSub.h"
 
-bool ppSubBackground(pmConfig *config, const pmFPAview *view)
+bool ppSubBackground(pmConfig *config)
 {
     psAssert(config, "Require configuration");
-    psAssert(view, "Require view");
 
     bool mdok; // Status of metadata lookups
@@ -36 +35 @@
     psImageMaskType maskBad = pmConfigMaskGet("BLANK", config); // Bits to mask
 
+    pmFPAview *view = ppSubViewReadout(); // View to readout
     pmReadout *outRO = pmFPAfileThisReadout(config->files, view, "PPSUB.OUTPUT"); // Output image
     pmReadout *modelRO = pmFPAfileThisReadout(config->files, view, "PSPHOT.BACKMDL"); // Background model
@@ -44 +44 @@
         if (!psphotModelBackground(config, view, "PPSUB.OUTPUT")) {
             psError(PS_ERR_UNKNOWN, false, "Unable to model background");
+            psFree(view);
             return false;
         }
@@ -50 +51 @@
         if (!modelRO) {
             psError(PS_ERR_UNEXPECTED_NULL, true, "Unable to find background model");
+            psFree(view);
             return false;
         }
     }
+    psFree(view);
+
     psImageBinning *binning = psMetadataLookupPtr(&mdok, modelRO->analysis,
                                                   "PSPHOT.BACKGROUND.BINNING"); // Binning for model

@@ -10 +10 @@
 stamp-h1
 ppSubKernel
+ppSubErrorCodes.h
+ppSubErrorCodes.c