Changeset 35521 for branches/eam_branches/ipp-20130419/pswarp/src/pswarpParseCamera.c

Timestamp:

May 6, 2013, 10:32:51 AM (13 years ago)

Author:

eugene

Message:

remove superfulous ppStats.h includes; generate output psf model

File:

• branches/eam_branches/ipp-20130419/pswarp/src/pswarpParseCamera.c (modified) (2 diffs)

branches/eam_branches/ipp-20130419/pswarp/src/pswarpParseCamera.c

@@ -179 +179 @@
     }
     
-    /// XXX re-enable after sources work
-    if (false && psMetadataLookupBool(&mdok, recipe, "PSF")) {
+    if (psMetadataLookupBool(&mdok, recipe, "PSF")) {
         // This file, PSPHOT.INPUT, is just used as a carrier; output files (eg, PSPHOT.RESID) are defined by
         // psphotDefineFiles
-        pmFPAfile *psphotInput = pmFPAfileDefineSkycell(config, NULL, "PSPHOT.INPUT");
+        // XXX old : pmFPAfile *psphotInput = pmFPAfileDefineSkycell(config, NULL, "PSPHOT.INPUT");
+        pmFPAfile *psphotInput = pmFPAfileDefineOutputForFormat(config, NULL, "PSPHOT.INPUT", skycell->cameraName, skycell->formatName);
         if (!psphotInput) {
             psError(psErrorCodeLast(), false, _("Unable to generate output file from PSPHOT.INPUT"));
@@ -189 +189 @@
         }
         psphotInput->src = psMemIncrRefCounter(output->fpa);
-        // specify the number of psphot input images
+
+        // specify the number of psphot input images (psphotReadout loops over all input images)
         psMetadataAddS32 (config->arguments, PS_LIST_TAIL, "PSPHOT.INPUT.NUM", PS_META_REPLACE, "number of inputs", 1);
 
-        pmFPAfile *psphotInSources = pmFPAfileDefineSkycell(config, output->fpa, "PSPHOT.INPUT.CMF");
+        // the input sources (read from the input astrometry file) are transformed (in pswarpLoop) to the readout->analysis
+        // entries of the output file PSWARP.OUTPUT.SOURCES, associated with the main output pmFPAfile PSWARP.OUTPUT
+
+        // the PSPHOT.INPUT.CMF is used to supply those sources to psphot (specifically psphotLoadPSFSources).  
+
+        // pmFPAfile *psphotInSources = pmFPAfileDefineSkycell(config, output->fpa, "PSPHOT.INPUT.CMF");
+        pmFPAfile *psphotInSources = pmFPAfileDefineOutputForFormat(config, output->fpa, "PSPHOT.INPUT.CMF", skycell->cameraName, skycell->formatName);
         if (!psphotInSources) {
             psError(psErrorCodeLast(), false, _("Unable to generate output file from PSPHOT.INPUT.CMF"));