Changeset 36635 for trunk/ppBackground/src/ppBackgroundStackCamera.c

Timestamp:

Apr 2, 2014, 1:13:06 PM (12 years ago)

Author:

watersc1

Message:

This version appears to complete and generate the expected output products. Now to test and tune the parameters.

File:

• trunk/ppBackground/src/ppBackgroundStackCamera.c (modified) (7 diffs)

trunk/ppBackground/src/ppBackgroundStackCamera.c

@@ -33 +33 @@
     pmConfig *config = data->config;    // Because I'm reusing code.
     int u,v;
-    size_t A,P;
+    //    size_t A,P;
     double RR = -9999.0 ,DD = -99999.0,rr = 9999.0,dd = 99999.0;
     // FIX Figure out what stacks we have to deal with.
@@ -115 +115 @@
       }
 
-      psMemStats(0,&A,&P);
-      fprintf(stderr,"fpa %ld %ld\n",A,P);
+/*       psMemStats(0,&A,&P); */
+/*       fprintf(stderr,"fpa %ld %ld\n",A,P); */
 
       pmChip *chip;                       // Chip from FPA
@@ -132 +132 @@
         }
 
-        psMemStats(0,&A,&P);
-        fprintf(stderr,"chip %ld %ld\n",A,P);
+/*      psMemStats(0,&A,&P); */
+/*      fprintf(stderr,"chip %ld %ld\n",A,P); */
 
         // read WCS data from the corresponding header
@@ -279 +279 @@
 
         
-        psMemStats(0,&A,&P);
-        fprintf(stderr,"chip2 %ld %ld\n",A,P);
-        
-/*      if (!pmFPAfileIOChecks(config, view, PM_FPA_AFTER)) { */
-/*        psError(psErrorCodeLast(), false, "Error saving data to files."); */
-/*        return false; */
-/*      } */
+/*      psMemStats(0,&A,&P); */
+/*      fprintf(stderr,"chip2 %ld %ld\n",A,P); */
       } // end chip loop
 
@@ -306 +301 @@
       pmFPAfileActivate(config->files, false, NULL);
       psFree(modelContent);
-      //      psFree(smfFile);
+      //       psFree(smfFile);       // This gets freed when we trash the config->files structure.  I think.  
       psFree(smfFileName);
       psFree(view);
@@ -313 +308 @@
       config->files = psMetadataAlloc();
       // 
-      
+
       //
     } // end smf loop
@@ -321 +316 @@
     config->files = config_files;
     
-    // Allocate the modelMap for the region we're covering.
-
-    psStats *stats = psStatsAlloc(PS_STAT_ROBUST_MEDIAN | PS_STAT_ROBUST_STDEV);
-    psImageBinning *binning = psImageBinningAlloc();
-    binning->nXruff = 33; // Number of samples
-    binning->nYruff = 33; 
-    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;
-    binning->nXskip = floor(data->ra_min);
-    binning->nYskip = floor(data->dec_min);
-    psImageBinningSetScale(binning,PS_IMAGE_BINNING_CENTER);
-    printf("Sizes: sky: %f %f -> %f %f :: tp: %f %f -> %f %f :: map: %d %d\n",
-           rr,dd,RR,DD,data->ra_min,data->dec_min,data->ra_max,data->dec_max,binning->nXfine,binning->nYfine);
-    data->modelMap = psImageMapNoImageAlloc( binning,stats);
+    // remove the {ra|dec}_min values from everything so we don't confuse the binning code.
+/*     psMetadataIterator *expIter = psMetadataIteratorAlloc(data->models, PS_LIST_HEAD, NULL); */
+/*     psMetadataItem *expItem; */
+/*     while ((expItem = psMetadataGetAndIncrement(expIter))) { */
+/*       if (expItem->type != PS_DATA_METADATA) { */
+/*      continue; // This is the N counter */
+/*       } */
+/*       psMetadataIterator *chipIter = psMetadataIteratorAlloc(expItem->data.md, PS_LIST_HEAD, NULL); */
+/*       psMetadataItem *chipItem; */
+/*       while ((chipItem = psMetadataGetAndIncrement(chipIter))) { */
+/*      psImage *ra    = psMetadataLookupPtr(NULL, chipItem->data.md, "bkg ra"); */
+/*      psImage *dec   = psMetadataLookupPtr(NULL, chipItem->data.md, "bkg dec"); */
+/*      for (v = 0; v < ra->numRows; v++) { */
+/*        for (u = 0; u < ra->numCols; u++) { */
+/*          ra->data.F32[v][u] -= data->ra_min; */
+/*          dec->data.F32[v][u] -= data->dec_min; */
+/*        } */
+/*      } */
+/*       } // End chip */
+/*       psFree(chipIter); */
+/*     } // End smfs */
+/*     psFree(expIter); */
+/*     // And from the structure objects. */
+/*     data->x_min -= data->ra_min; */
+/*     data->y_min -= data->dec_min; */
+/*     data->x_max -= data->ra_min; */
+/*     data->y_max -= data->dec_min; */
+/* /\*     data->ra_max -= data->ra_min; *\/ */
+/* /\*     data->dec_max -= data->dec_min; *\/ */
+/* /\*     data->ra_min = 0.0; *\/ */
+/* /\*     data->dec_min = 0.0; *\/ */
+
     
     return true;