Changeset 36642 for trunk/ppBackground/src/ppBackgroundStackLoop.c

Timestamp:

Apr 2, 2014, 3:55:33 PM (12 years ago)

Author:

watersc1

Message:

Still not perfect, as it seems to be improperly clipping bad inputs. This version does fix the exposure time scaling issue.

File:

• trunk/ppBackground/src/ppBackgroundStackLoop.c (modified) (4 diffs)

trunk/ppBackground/src/ppBackgroundStackLoop.c

@@ -76 +76 @@
       pmFPAview *view = pmFPAviewAlloc(0);
 
+      //      pmHDU *phu = pmFPAviewThisPHU(view, stack->fpa);
+      psF32 exptime = 1.0;
+      exptime = psMetadataLookupF32(NULL, stack->fpa->hdu->header, "EXPTIME");
+      
       // PART 1:
       // Determine the extent of the model map for this stack
@@ -124 +128 @@
       psStats *stats = psStatsAlloc(PS_STAT_ROBUST_MEDIAN | PS_STAT_ROBUST_STDEV);
       psImageBinning *binning = psImageBinningAlloc();
-      binning->nXruff = 15; // Number of samples
-      binning->nYruff = 15; 
+      binning->nXruff = 13; // Number of samples
+      binning->nYruff = 13; 
       //    binning->nXfine = ceil(data->ra_max - data->ra_min) + 1; // This is the range we're looking at
       //    binning->nYfine = ceil(data->dec_max - data->dec_min) + 1;
@@ -169 +173 @@
 
       // This is where an iterative solution loop would likely start.
-      {
+      for (int iterator = 0; iterator < 2; iterator++) {
         // Construct the offset information
         printf("Model fit!\n");
@@ -298 +302 @@
                 psPlaneTransformApply(tp, stack->fpa->toTPA, pix);
                 
-                model->image->data.F32[y][x] = psImageMapEval(data->modelMap,tp->x,tp->y);
+                model->image->data.F32[y][x] = exptime * psImageMapEval(data->modelMap,tp->x,tp->y);
                 corr->image->data.F32[y][x] = readout->image->data.F32[y][x] + model->image->data.F32[y][x];