Changeset 28013 for trunk/psphot/src/psphotStackChisqImage.c

Timestamp:

May 18, 2010, 4:11:53 PM (16 years ago)

Author:

eugene

Message:

merge changes from branches/eam_branches/psphot,psModules.20100506 (finish basic psphotStack)

Location:

trunk/psphot

Files:

• . (modified) (1 prop)
• src/psphotStackChisqImage.c (modified) (7 diffs)

trunk/psphot/src/psphotStackChisqImage.c

@@ -6 +6 @@
 
 // XXX supply filename or keep PSPHOT.INPUT fixed?
-bool psphotStackChisqImage (pmConfig *config, const pmFPAview *view)
+bool psphotStackChisqImage (pmConfig *config, const pmFPAview *view, const char *ruleDet, const char *ruleCnv)
 {
     bool status = false;
@@ -21 +21 @@
 
     // loop over the available readouts
+    // generate the chisq image from the 'detection' images
     for (int i = 0; i < num; i++) {
-        if (!psphotStackChisqImageAddReadout(config, view, &chiReadout, "PSPHOT.INPUT", i)) {
-            psError (PSPHOT_ERR_CONFIG, false, "failed to model background for PSPHOT.INPUT entry %d", i);
+        if (!psphotStackChisqImageAddReadout(config, view, ruleDet, &chiReadout, i)) {
+            psError (PSPHOT_ERR_CONFIG, false, "failed to model background for %s entry %d", ruleDet, i);
             return false;
         }
@@ -35 +36 @@
     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)) {
+    // save the resulting image in the 'detection' set
+    if (!psMetadataAddPtr(config->files, PS_LIST_TAIL, ruleDet, PS_DATA_UNKNOWN | PS_META_DUPLICATE_OK, "", chisqFile)) {
+        psError(PM_ERR_CONFIG, false, "could not add chisqFPA to config files");
+        return false;
+    }
+
+    // save the resulting image in the 'convolved' set
+    if (!psMetadataAddPtr(config->files, PS_LIST_TAIL, ruleCnv, PS_DATA_UNKNOWN | PS_META_DUPLICATE_OK, "", chisqFile)) {
         psError(PM_ERR_CONFIG, false, "could not add chisqFPA to config files");
         return false;
@@ -48 +55 @@
 bool psphotStackChisqImageAddReadout(const pmConfig *config, // Configuration
                                      const pmFPAview *view,
+                                     const char *filerule, 
                                      pmReadout **chiReadout,
-                                     char *filename, 
                                      int index) 
 {
@@ -55 +62 @@
 
     // find the currently selected readout
-    pmFPAfile *input = pmFPAfileSelectSingle(config->files, filename, index); // File of interest
+    pmFPAfile *input = pmFPAfileSelectSingle(config->files, filerule, index); // File of interest
     psAssert (input, "missing file?");
 
@@ -111 +118 @@
 }
 
-bool psphotStackRemoveChisqFromInputs (pmConfig *config) {
+bool psphotStackRemoveChisqFromInputs (pmConfig *config, const char *filerule) {
 
     bool status = false;
@@ -121 +128 @@
     psAssert (status, "programming error: must define PSPHOT.INPUT.NUM");
 
-    pmFPAfileRemoveSingle (config->files, "PSPHOT.INPUT", chisqNum);
+    pmFPAfileRemoveSingle (config->files, filerule, chisqNum);
 
     inputNum --;