Changeset 34667

Timestamp:

Nov 15, 2012, 5:56:47 PM (14 years ago)

Author:

watersc1

Message:

Fixed one problem (the mask wasn't set, so the scaling code refused to scale the floats correctly), now having PSPHOT.DETECTIONS issues again.

Location:

branches/czw_branch/20120906

Files:

• ppStack/src/ppStackCombinePrepare.c (modified) (2 diffs)
• ppStack/src/ppStackThread.c (modified) (1 diff)
• psModules/src/imcombine/pmStack.c (modified) (1 diff)

branches/czw_branch/20120906/ppStack/src/ppStackCombinePrepare.c

@@ -26 +26 @@
     pmCell *cell = pmFPAfileThisCell(config->files, view, outName); // Output cell
     options->outRO = pmReadoutAlloc(cell); // Output readout
-    
-    pmCell *expCell = pmFPAfileThisCell(config->files, view, expName); // Exposure cell
-    options->expRO = pmReadoutAlloc(expCell); // Output readout
 
+    if (expName) {
+      pmCell *expCell = pmFPAfileThisCell(config->files, view, expName); // Exposure cell
+      options->expRO = pmReadoutAlloc(expCell); // Output readout
+    }
+    else {
+      options->expRO = NULL;
+    }
     pmCell *bkgCell;
     int bkg_r0,bkg_c0;
@@ -78 +82 @@
     }
 
-    if (!pmReadoutStackDefineOutput(options->expRO, col0, row0, numCols, numRows, true, true, 0)) {
+    if (expName) {
+      if (!pmReadoutStackDefineOutput(options->expRO, col0, row0, numCols, numRows, true, true, 0)) {
         psError(PPSTACK_ERR_ARGUMENTS, false, "Unable to prepare output.");
         return false;
+      }
     }
 

branches/czw_branch/20120906/ppStack/src/ppStackThread.c

@@ -97 +97 @@
             psFree(resolved); \
         }
-        fprintf(stderr,"ppST:99 %s %s\n",pmConfigConvertFilename(imageNames->data[i], config, false, false),
-                (char*)imageNames->data[i]);
                 
         IMAGE_OPEN(imageNames, stack->imageFits, i);

branches/czw_branch/20120906/psModules/src/imcombine/pmStack.c

@@ -1401 +1401 @@
       }
       combined->image->data.F32[y][x] = stats->robustMedian;
+      combined->mask->data.PS_TYPE_IMAGE_MASK_DATA[y][x] = 0;
     }
   }