Changeset 30118 for branches/czw_branch/20101203/ppSub/src/ppSubBackground.c

Timestamp:

Dec 20, 2010, 2:30:45 PM (16 years ago)

Author:

watersc1

Message:

Attempting to bring branch in sync with trunk

Location:

branches/czw_branch/20101203

Files:

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

branches/czw_branch/20101203/ppSub/src/ppSubBackground.c

@@ -37 +37 @@
     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
 
-    // Generate the background model, if required
+    // Generate the background model
+    if (!psphotModelBackground(config, view, "PPSUB.OUTPUT")) {
+      psError(psErrorCodeLast(), false, "Unable to model background");
+      psFree(view);
+      return false;
+    }
+
+    // select the model readout (should now exist)
+    pmReadout *modelRO = pmFPAfileThisReadout(config->files, view, "PSPHOT.BACKMDL");
     if (!modelRO) {
-        // Create the background model
-        if (!psphotModelBackgroundReadoutFileIndex(config, view, "PPSUB.OUTPUT", 0)) {
-            psError(psErrorCodeLast(), false, "Unable to model background");
-            psFree(view);
-            return false;
-        }
-        // select the model readout (should now exist)
-        modelRO = pmFPAfileThisReadout(config->files, view, "PSPHOT.BACKMDL");
-        if (!modelRO) {
-            psError(psErrorCodeLast(), false, "Unable to find background model");
-            psFree(view);
-            return false;
-        }
+      psError(psErrorCodeLast(), false, "Unable to find background model");
+      psFree(view);
+      return false;
     }
     psFree(view);
 
-    psImageBinning *binning = psMetadataLookupPtr(&mdok, modelRO->analysis,
-                                                  "PSPHOT.BACKGROUND.BINNING"); // Binning for model
+    psImageBinning *binning = psMetadataLookupPtr(&mdok, modelRO->analysis, "PSPHOT.BACKGROUND.BINNING"); // Binning for model
     psImage *modelImage = modelRO->image; // Background model
     psImage *image = outRO->image; // Image of interest
@@ -83 +79 @@
     }
 
-    pmFPAfileDropInternal(config->files, "PSPHOT.BACKMDL");
-    pmFPAfileDropInternal(config->files, "PSPHOT.BACKMDL.STDEV");
-
     return true;
 }