Changeset 26543 for branches/eam_branches/20091201/ppStack

Timestamp:

Jan 7, 2010, 5:37:07 PM (17 years ago)

Author:

eugene

Message:

update to use new PSPHOT.INPUT handling code which allows multiple images

Location:

branches/eam_branches/20091201/ppStack/src

Files:

• ppStackCamera.c (modified) (2 diffs)
• ppStackMatch.c (modified) (1 diff)

branches/eam_branches/20091201/ppStack/src/ppStackCamera.c

@@ -373 +373 @@
         psMetadataLookupBool(&mdok, config->arguments, "-photometry"); // perform photometry
     if (doPhotom) {
-        // This file, PSPHOT.INPUT, is just used as a carrier; output files (eg, PSPHOT.RESID) are defined by
-        // psphotDefineFiles
+        // This pmFPAfile, PSPHOT.INPUT, is just used as a carrier; output files (eg,
+        // PSPHOT.RESID) are defined by psphotDefineFiles
         pmFPAfile *psphotInput = pmFPAfileDefineFromFPA(config, output->fpa, 1, 1, "PSPHOT.INPUT");
         if (!psphotInput) {
@@ -380 +380 @@
             return false;
         }
+        // specify the number of psphot input images
+        psMetadataAddS32 (config->arguments, PS_LIST_TAIL, "PSPHOT.INPUT.NUM", PS_META_REPLACE, "number of inputs", 1);
 
         // Define associated psphot input/output files

branches/eam_branches/20091201/ppStack/src/ppStackMatch.c

@@ -144 +144 @@
     psMetadataAddU8(psphotRecipe, PS_LIST_TAIL, "MASK.PSPHOT", PS_META_REPLACE, "user-defined mask", maskBad);
 
-    psImage *binned = psphotBackgroundModel(ro, config); // Binned background model
+    psImage *binned = psphotModelBackgroundReadoutNoFile(ro, config); // Binned background model
     psImageBinning *binning = psMetadataLookupPtr(NULL, ro->analysis,
                                                   "PSPHOT.BACKGROUND.BINNING"); // Binning for model