Changeset 27625 for branches/eam_branches/stackphot.20100406/psphot/src/psphotStackChisqImage.c

Timestamp:

Apr 6, 2010, 1:36:51 PM (16 years ago)

Author:

eugene

Message:

working on stackphot

File:

• branches/eam_branches/stackphot.20100406/psphot/src/psphotStackChisqImage.c (modified) (3 diffs)

branches/eam_branches/stackphot.20100406/psphot/src/psphotStackChisqImage.c

@@ -12 +12 @@
     psTimerStart ("psphot.chisq.image");
 
+    pmFPAfile *chisqFile = pmFPAfileSelectSingle(config->files, "PSPHOT.CHISQ.OUTPUT", 0);
+    psAssert (chisqFile, "missing chisq image FPA?");
+
+    pmCell *chisqCell = pmFPAviewThisCell(view, chisqFile->fpa);
+
     // create a holder for the image
-    pmReadout *chiImage = pmReadoutAlloc();
+    pmReadout *chiReadout = pmFPAviewThisReadout(view, chisqFile->fpa);
+    if (!chiReadout) {
+      chiReadout = pmReadoutAlloc(chisqCell);
+    } else {
+      psMemIncrRefCounter(chiReadout);
+    }
 
     int num = psMetadataLookupS32 (&status, config->arguments, "PSPHOT.INPUT.NUM");
@@ -20 +30 @@
     // loop over the available readouts
     for (int i = 0; i < num; i++) {
-        if (!psphotStackChisqImageAddReadout(config, view, chiImage, "PSPHOT.INPUT", i)) {
+        if (!psphotStackChisqImageAddReadout(config, view, chiReadout, "PSPHOT.INPUT", i)) {
             psError (PSPHOT_ERR_CONFIG, false, "failed to model background for PSPHOT.INPUT entry %d", i);
             return false;
@@ -26 +36 @@
     }
 
+    num = psMetadataLookupS32 (&status, config->arguments, "PSPHOT.INPUT.NUM");
+    psAssert (status, "programming error: must define PSPHOT.INPUT.NUM");
+
+    psMetadataAddS32(config->arguments, PS_LIST_TAIL, "PSPHOT.CHISQ.NUM", PS_META_REPLACE, "", num);
+    num++;
+    psMetadataAddS32(config->arguments, PS_LIST_TAIL, "PSPHOT.INPUT.NUM", PS_META_REPLACE, "", num);
+
     // need to save the resulting image somewhere (PSPHOT.INPUT?)
+    if (!psMetadataAddPtr(config->files, PS_LIST_TAIL, "PSPHOT.INPUT", PS_DATA_UNKNOWN | PS_META_DUPLICATE_OK, "", chisqFile)) {
+        psError(PM_ERR_CONFIG, false, "could not add chisqFPA to config files");
+        return false;
+    }
 
     psLogMsg ("psphot", PS_LOG_INFO, "built chisq image: %f sec\n", psTimerMark ("psphot.chisq.image"));
 
+    psFree (chiReadout);
     return true;
 }
 
 bool psphotStackChisqImageAddReadout(const pmConfig *config, // Configuration
-                                     pmFPAview *view,
+                                     const pmFPAview *view,
                                      pmReadout *chiReadout,
                                      char *filename,