Changeset 27840 for branches/simtest_nebulous_branches/ppImage/src/ppImageReplaceBackground.c

Timestamp:

May 3, 2010, 8:50:52 AM (16 years ago)

Author:

eugene

Message:

updates from trunk

Location:

branches/simtest_nebulous_branches

Files:

• . (modified) (1 prop)
• ppImage/src/ppImageReplaceBackground.c (modified) (2 diffs)

branches/simtest_nebulous_branches/ppImage/src/ppImageReplaceBackground.c

@@ -74 +74 @@
     pmReadout *modelRO = NULL;
     pmFPAfile *modelFile = psMetadataLookupPtr(&status, config->files, "PSPHOT.BACKMDL"); // Background model
-    if (modelFile) {
+    if (modelFile && modelFile->fpa) {
         modelRO = pmFPAviewThisReadout(&roView, modelFile->fpa); // Background model
     }
@@ -80 +80 @@
     // the background model has not been defined, or at least not generated
     if (!modelFile || !modelRO) {
-        if (!psphotModelBackground(config, &roView, "PPIMAGE.CHIP")) {
+        if (!psphotModelBackgroundReadoutFileIndex(config, &roView, "PPIMAGE.CHIP", 0)) {
             psError(PS_ERR_UNKNOWN, false, "Unable to model background");
             return false;