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

Timestamp:

Mar 11, 2014, 3:46:50 PM (12 years ago)

Author:

watersc1

Message:

Debuggable complete version of ppBackgroundStack. It doesn't seem to work, as I'm losing my data structures somehow.

File:

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

trunk/ppBackground/src/ppBackgroundStackCamera.c

@@ -36 +36 @@
     psString stackName = data->stacks->data[0];
     fileArguments("IMAGE", stackName, "Input image", data->config);
-    pmFPAfile *stack = pmFPAfileDefineFromArgs(&status, data->config, "PPBACKGROUND.STACK",
-                                               "IMAGE");
+    psFree(stackName);
+    pmFPAfile *stack = pmFPAfileDefineFromArgs(&status, data->config,
+                                               "PPBACKGROUND.STACK", "IMAGE");
     if (!status || !stack) {
       psError(psErrorCodeLast(), false, "Failed to build file from PPBACKGROUND.STACK");
@@ -43 +44 @@
     }
 
+    if (!pmAstromReadBilevelMosaic(stack->fpa,stack->fpa->hdu->header)) {
+      psError(psErrorCodeLast(), false, "Unable to read WCS astrometry for input stack.");
+      return false;
+    }
+    psArrayAdd(data->stack_data,data->stack_data->n,psMemIncrRefCounter(stack));
+    
     // Read over the input background models.    
     psMetadataIterator *iter = psMetadataIteratorAlloc(data->contents, PS_LIST_HEAD, NULL); // Iterator
     psMetadataItem *item; // Item from iteration
-    //    int i = 0;
+    int i = 0;
     while ((item = psMetadataGetAndIncrement(iter))) {
+      i++;
       if (item->type != PS_DATA_METADATA) {
         psError(PPBACKGROUND_ERR_ARGUMENTS, true,
@@ -58 +66 @@
 
       psString smfFileName = psMetadataLookupStr(NULL, input, "astrom");
-
+      psMetadata *modelContent = psMetadataLookupMetadata(NULL, input, "models");
       // Read the smf file from this item
       fileArguments("astrom",smfFileName,"",config);
@@ -68 +76 @@
         return NULL;
       }
-      
+      printf("CZW: Item %d\n",i);
       // find the FPA phu
       bool bilevelAstrometry = false;
@@ -91 +99 @@
         }
         const char *chipName = psMetadataLookupStr(NULL, chip->concepts, "CHIP.NAME"); // Name of chip
-/*      if (data->chipName && strcmp(chipName, data->chipName) != 0) { */
-/*        continue; */
-/*      } */
         if (!pmFPAfileIOChecks(config, view, PM_FPA_BEFORE)) {
           psError(psErrorCodeLast(), false, "Error loading data from files.");
           return false;
         }
-
         if (chip->cells->n != 1) {
           psWarning("More than one cell present for chip %d", view->chip);
         }
+
         // read WCS data from the corresponding header
         pmHDU *hdu = pmFPAviewThisHDU (view, smfFile->fpa);
@@ -124 +129 @@
 
         // FIX Load model data for this chip
-        psString modelFileName = psMetadataLookupStr(NULL, input, chipName);
+        psString modelFileName = pmConfigConvertFilename(psMetadataLookupStr(NULL, modelContent, chipName),
+                                                         config, PM_FPA_MODE_READ, false);
         psFits *modelFits = psFitsOpen(modelFileName,"r");
-        int nC, nR;
-        psElemType *type;
-        psRegion region;
-        psFitsImageSize(&nC,&nR,type,modelFits,region);
-        psImage *image = psFitsReadImage(modelFits,region,0);
+        psImage *image = psFitsReadImage(modelFits,psRegionSet(0,0,0,0),0);
         psMetadata *header = psFitsReadHeader(NULL,modelFits);
-
+        
         // Allocate the data structures for this chip
         psImage *raim = psImageAlloc(image->numCols,image->numRows,PS_TYPE_F32);
@@ -177 +179 @@
 
         // Attach vectors to teh structure of the chip
-        psMetadataAddPtr(chip->analysis,PS_LIST_TAIL,"bkg image", PS_DATA_UNKNOWN | PS_META_REPLACE, "ota space X vector", image);
-        psMetadataAddPtr(chip->analysis,PS_LIST_TAIL,"bkg ra", PS_DATA_UNKNOWN | PS_META_REPLACE, "ota space X vector", raim);
-        psMetadataAddPtr(chip->analysis,PS_LIST_TAIL,"bkg dec", PS_DATA_UNKNOWN | PS_META_REPLACE, "ota space X vector", decim);
-        psMetadataAddPtr(chip->analysis,PS_LIST_TAIL,"bkg calibrated data", PS_DATA_UNKNOWN | PS_META_REPLACE, "ota space corrected data", model);
+        psMetadataAddImage(chip->analysis,PS_LIST_TAIL,
+                           "bkg image", 0,
+                           "ota space X vector", image);
+        psMetadataAddImage(chip->analysis,PS_LIST_TAIL,
+                           "bkg ra", 0,
+                           "ota space ra vector", raim);
+        psMetadataAddImage(chip->analysis,PS_LIST_TAIL,
+                           "bkg dec", 0,
+                           "ota space dec vector", decim);
+        psMetadataAddImage(chip->analysis,PS_LIST_TAIL,
+                           "bkg calibrated data", 0,
+                           "ota space corrected data", model);
 
         // Define default background model parameters, using the assumption:
         // observed = camera + offset + scale * astrophysical
-        psMetadataAddF32(chip->analysis,PS_LIST_TAIL,"bkg offset", PS_META_REPLACE, "background offset for this exposure/ota pair", 0.0);
-        psMetadataAddF32(chip->analysis,PS_LIST_TAIL,"bkg scale", PS_META_REPLACE, "background scale parameter for this exposure/ota pair", 1.0);
+        psMetadataAddF32(chip->analysis,PS_LIST_TAIL,
+                         "bkg offset", PS_META_REPLACE,
+                         "background offset for this exposure/ota pair", 0.0);
+        psMetadataAddF32(chip->analysis,PS_LIST_TAIL,
+                         "bkg scale", PS_META_REPLACE,
+                         "background scale parameter for this exposure/ota pair", 1.0);
         // FIX Free model data for this chip
+        psFree(modelFileName);
+        psFree(modelFits);
         psFree(header);
-        psFree(modelFits);
-        psFree(modelFileName);
-
+        psFree(pix);
+        psFree(fp);
+        psFree(tp);
+        psFree(sky);
+        psFree(image);
+        psFree(raim);
+        psFree(decim);
+        psFree(model);
 
         // Check to see if we've loaded or allocated an OTA solution container for this chip
@@ -197 +218 @@
           if (data->fit_OTAS) { // We are fitting OTAs, so allocate a new image
             psImage *solution = psImageAlloc(image->numCols,image->numRows,PS_TYPE_F32);
-            psMetadataAddPtr(data->OTA_solutions,PS_LIST_TAIL, chipName, PS_DATA_UNKNOWN | PS_META_REPLACE, "OTA solution element", solution);
+            psMetadataAddPtr(data->OTA_solutions,PS_LIST_TAIL,
+                             chipName, PS_DATA_UNKNOWN | PS_META_REPLACE,
+                             "OTA solution element", solution);
           }
           else { // We are not fitting OTAs, so read the one that should be saved on OTApath.
@@ -203 +226 @@
             psStringAppend(&solutionFileName, ".%s.fits",chipName);
             psFits *solutionFits = psFitsOpen(solutionFileName,"r");
-            psImage *solution = psFitsReadImage(solutionFits,region,0);
-            psMetadataAddPtr(data->OTA_solutions,PS_LIST_TAIL, chipName, PS_DATA_UNKNOWN | PS_META_REPLACE, "OTA solution element", solution);
+            psImage *solution = psFitsReadImage(solutionFits,psRegionSet(0,0,0,0),0);
+            psMetadataAddImage(data->OTA_solutions,PS_LIST_TAIL,
+                               chipName, 0,
+                               "OTA solution element", solution);
+            psFree(solutionFits);
+            psFree(solutionFileName);
+            psFree(solution);
           }
         }
@@ -210 +238 @@
         // FIX Hopefully this isn't going to destroy everything.
         // Chip
-        if (!pmFPAfileIOChecks(config, view, PM_FPA_AFTER)) {
-          psError(psErrorCodeLast(), false, "Error saving data to files.");
-          return false;
-        }
+/*      if (!pmFPAfileIOChecks(config, view, PM_FPA_AFTER)) { */
+/*        psError(psErrorCodeLast(), false, "Error saving data to files."); */
+/*        return false; */
+/*      } */
       }
       // FPA
-      if (!pmFPAfileIOChecks(config, view, PM_FPA_AFTER)) {
-        psError(psErrorCodeLast(), false, "Error saving data to files.");
-        return false;
-      }
+/*       if (!pmFPAfileIOChecks(config, view, PM_FPA_AFTER)) { */
+/*      psError(psErrorCodeLast(), false, "Error saving data to files."); */
+/*      return false; */
+/*       } */
 
       // Add this smf to the smf array.
       psArrayAdd(data->smfs,data->smfs->n,psMemIncrRefCounter(smfFile));
+      psFree(smfFile);
     }