Changeset 36642 for trunk

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.

Location:

trunk/ppBackground/src

Files:

• ppBackgroundStackCamera.c (modified) (4 diffs)
• ppBackgroundStackLoop.c (modified) (4 diffs)
• ppBackgroundStackMath.c (modified) (1 diff)

trunk/ppBackground/src/ppBackgroundStackCamera.c

@@ -114 +114 @@
         }
       }
-
-/*       psMemStats(0,&A,&P); */
-/*       fprintf(stderr,"fpa %ld %ld\n",A,P); */
+      
+      psF32 exptime = 1.0;
+      exptime = psMetadataLookupF32(NULL, phu->header, "EXPTIME");
 
       pmChip *chip;                       // Chip from FPA
@@ -197 +197 @@
             decim->data.F32[v][u] = tp->y;
             model->data.F32[v][u] = 0.0;
-
+            image->data.F32[v][u] /= exptime;
             // Check the bounds so we'll know how large of an area to model in the map
             if (tp->x < data->ra_min) { data->ra_min = tp->x; }
@@ -277 +277 @@
           }
         }
-
-        
-/*      psMemStats(0,&A,&P); */
-/*      fprintf(stderr,"chip2 %ld %ld\n",A,P); */
       } // end chip loop
 
@@ -290 +286 @@
                        "N", PS_META_REPLACE,
                        "counter", i);
-      // data->models->name->XY__->{image/ra/dec/calibrated/offset/scale}
-      // data->models->counter->XY__->{image/ra/dec/calibrated/offset/scale}
-
-      
       
       if (!pmFPAfileIOChecks(config, view, PM_FPA_AFTER)) {

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];
                 

trunk/ppBackground/src/ppBackgroundStackMath.c

@@ -103 +103 @@
           psVectorAppend(obs,image->data.F32[v][u]);
           psVectorAppend(model, psImageMapEval(data->modelMap,ra->data.F32[v][u],dec->data.F32[v][u]));
-          //      obs->data.F32[v * image->numCols + u] = image->data.F32[v][u];
-          //      model->data.F32[v * image->numCols + u] = psImageMapEval(data->modelMap,ra->data.F32[v][u],dec->data.F32[v][u]);
         }
       }