Changeset 35167

Timestamp:

Feb 13, 2013, 4:18:09 PM (13 years ago)

Author:

watersc1

Message:

Use the options to hold the doBackground boolean. Changes in ppStackCamera to reset the recipe value if no inputs are specified.

Location:

trunk/ppStack/src

Files:

• ppStackCamera.c (modified) (4 diffs)
• ppStackCombineAlternate.c (modified) (1 diff)
• ppStackLoop.c (modified) (2 diffs)
• ppStackOptions.c (modified) (1 diff)
• ppStackOptions.h (modified) (1 diff)
• ppStackSetup.c (modified) (1 diff)

trunk/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
-            }
+              //            }
 
 

trunk/ppStack/src/ppStackCombineAlternate.c

@@ -88 +88 @@
   }
 
+  if (!ppStackLinearScale(inputs, config)) {
+    psFree(inputs);
+    return(false);
+  }
 
   // Do combination

trunk/ppStack/src/ppStackLoop.c

@@ -63 +63 @@
     }
 
-    bool doBackground = psMetadataLookupBool(NULL, recipe, "BACKGROUND.MODEL");
+    //    bool doBackground = psMetadataLookupBool(NULL, recipe, "BACKGROUND.MODEL");
 
     // Prepare for combination
-    if (!ppStackCombinePrepare("PPSTACK.OUTPUT", "PPSTACK.OUTPUT.EXP", doBackground ? "PPSTACK.OUTPUT.BKGMODEL" : NULL, PPSTACK_FILES_STACK, stack, options, config)) {
+    if (!ppStackCombinePrepare("PPSTACK.OUTPUT", "PPSTACK.OUTPUT.EXP", options->doBackground ? "PPSTACK.OUTPUT.BKGMODEL" : NULL, PPSTACK_FILES_STACK, stack, options, config)) {
         psError(psErrorCodeLast(), false, "Unable to prepare for combination.");
         psFree(stack);
@@ -146 +146 @@
 
     // Generate median background stack here.
-    if (doBackground && !ppStackCombineBackground(stack, options, config)) {
+    if (options->doBackground && !ppStackCombineBackground(stack, options, config)) {
       psError(psErrorCodeLast(), false, "Unable to generate median of background images.");
       psFree(stack);

trunk/ppStack/src/ppStackOptions.c

@@ -43 +43 @@
     options->matchZPs = true;
     options->photometry = false;
+    options->doBackground = false;
     options->stats = NULL;
     options->statsFile = NULL;

trunk/ppStack/src/ppStackOptions.h

@@ -8 +8 @@
     bool matchZPs;                      // Adjust relative fluxes based on transparency analysis?
     bool photometry;                    // Perform photometry?
+    bool doBackground;                  // Do background model combination?
     psMetadata *stats;                  // Statistics for output
     FILE *statsFile;                    // File to which to write statistics

trunk/ppStack/src/ppStackSetup.c

@@ -17 +17 @@
 
     options->convolve = psMetadataLookupBool(NULL, recipe, "CONVOLVE"); // Convolve images?
+    options->doBackground = psMetadataLookupBool(NULL, recipe, "BACKGROUND.MODEL");
+
     if (!psMetadataLookupBool(NULL, config->arguments, "HAVE.PSF")) {
         psWarning("No PSFs provided --- unable to convolve to common PSF.");