Changeset 35236 for branches/eam_branches/ipp-20130207/ppStack/src/ppStackCamera.c

Timestamp:

Mar 5, 2013, 2:24:05 PM (13 years ago)

Author:

eugene

Message:

merge changes from trunk

Location:

branches/eam_branches/ipp-20130207

Files:

• . (modified) (1 prop)
• ppStack/src/ppStackCamera.c (modified) (4 diffs)

branches/eam_branches/ipp-20130207/ppStack/src/ppStackCamera.c

@@ -48 +48 @@
     bool convolve = psMetadataLookupBool(NULL, recipe, "CONVOLVE"); // Convolve images before stack?
     bool doBackground = psMetadataLookupBool(NULL, recipe, "BACKGROUND.MODEL");
-    
+    //    fprintf(stderr,"ppSC: %d\n",doBackground);    
     psArray *runImages = pmFPAfileDefineMultipleFromRun(&status, NULL, config,
                                                         "PPSTACK.INPUT"); // Input images from previous run
@@ -218 +218 @@
 
             // Grab bkgmodel information here
-            if (doBackground) {
-              if (!bkgmodel ||  strlen(bkgmodel) == 0) {
+            
+            //      if (doBackground) {
+              if ((!bkgmodel) || (strlen(bkgmodel) == 0)) {
                 // We have no background models.
+                //              fprintf(stderr,"No backgrounds specified, resettting recipe value.\n");
+                doBackground = false;
+                psMetadataAddBool(recipe, PS_LIST_TAIL, "BACKGROUND.MODEL", PS_META_REPLACE,
+                                  "Do photometry on stacked image?", false);
+
               }
               else {
@@ -227 +233 @@
                 if (!inputBKG) {
                   // We failed to generate an pmFPAfile, so disable the background construction and continue.
+                  //              fprintf(stderr,"No backgrounds specified, resettting recipe value.\n");
                   doBackground = false;
                   psMetadataAddBool(recipe, PS_LIST_TAIL, "BACKGROUND.MODEL", PS_META_REPLACE,
@@ -238 +245 @@
                 }
               }// End bkgmodel
-            }
+              //            }