Changeset 34041 for branches/meh_branches/ppstack_test/ppStack/src/ppStackMatch.c

Timestamp:

Jun 19, 2012, 5:24:19 PM (14 years ago)

Author:

mhuber

Message:

merging latest r34040 trunk changes to branch

Location:

branches/meh_branches/ppstack_test

Files:

• . (modified) (1 prop)
• ppStack/src/ppStackMatch.c (modified) (3 diffs)

branches/meh_branches/ppstack_test/ppStack/src/ppStackMatch.c

@@ -9 +9 @@
 //MEH - modified TESTING to be outputs only, reuse convolved now own
 //#define TESTING_REUSE_CONV              // Enable debugging re-using convolved outputs from previous run
+// #define TESTING_REUSE_CONV           // Enable debugging for re-using convolved outputs from previous run
 
 #ifdef TESTING_REUSE_CONV
@@ -57 +58 @@
     psAssert(psphotRecipe, "Need PSPHOT recipe");
 
-    psString maskBadStr = psMetadataLookupStr(NULL, ppStackRecipe, "MASK.BAD");// Name of bits to mask for bad
+    //MEH - bill found this should be MASK.VAL
+//    psString maskBadStr = psMetadataLookupStr(NULL, ppStackRecipe, "MASK.BAD");// Name of bits to mask for bad
+    psString maskBadStr = psMetadataLookupStr(NULL, ppStackRecipe, "MASK.VAL");// Name of bits to mask for bad
     psMaskType maskBad = pmConfigMaskGet(maskBadStr, config); // Bits to mask for bad pixels
 
@@ -261 +264 @@
             fake->image = psImageCopy(NULL, target, PS_TYPE_F32);
             fake->mask = psImageCopy(NULL, readout->mask, PS_TYPE_IMAGE_MASK);
-            //MEH add fake->variance just as fake->image for testing passing along fully make difference in soln
+            //MEH test add fake->variance just as fake->image for testing passing along fully make difference in soln
             //fake->variance = psImageCopy(NULL, target, PS_TYPE_F32);
+
+            //MEH -- could add TESTING to output start_ here before adding background - but not same as includes all/merged target sources?
+            //    -- useless as now is essentially the target.fits anyways
 
 #if 1