Changeset 35324 for branches/eam_branches/ipp-20130307/ppStack/src/ppStackCamera.c

Timestamp:

Mar 19, 2013, 2:52:56 PM (13 years ago)

Author:

eugene

Message:

clean up some of the background model code (unused variables)

File:

• branches/eam_branches/ipp-20130307/ppStack/src/ppStackCamera.c (modified) (2 diffs)

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

@@ -47 +47 @@
     }
     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 +217 @@
 
             // Grab bkgmodel information here
-            
-            //      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);
-
+            if ((!bkgmodel) || (strlen(bkgmodel) == 0)) {
+              // We have no background models.
+              psMetadataAddBool(recipe, PS_LIST_TAIL, "BACKGROUND.MODEL", PS_META_REPLACE, "Do photometry on stacked image?", false);
+            } else {
+              pmFPAfile *inputBKG = defineFile(config,NULL,"PPSTACK.INPUT.BKGMODEL",bkgmodel, PM_FPA_FILE_IMAGE);
+              if (!inputBKG) {
+                psMetadataAddBool(recipe, PS_LIST_TAIL, "BACKGROUND.MODEL", PS_META_REPLACE, "Do photometry on stacked image?", false);
+
+#if (0)
+                psError(psErrorCodeLast(), false,
+                        "Unable to define file from bkgmodel %d (%s)",i,bkgmodel);
+                return(false);
+#endif
               }
-              else {
-                pmFPAfile *inputBKG = defineFile(config,NULL,"PPSTACK.INPUT.BKGMODEL",bkgmodel,
-                                                 PM_FPA_FILE_IMAGE);
-                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,
-                                    "Do photometry on stacked image?", false);
-
-#if (0)
-                  psError(psErrorCodeLast(), false,
-                          "Unable to define file from bkgmodel %d (%s)",i,bkgmodel);
-                  return(false);
-#endif
-                }
-              }// End bkgmodel
-              //            }
-
-
-            
-            
+            } // End bkgmodel
             i++;
         }