Changeset 42186 for branches/eam_branches/ipp-20220316/fpcamera/src/fpcameraAnalysis.c

Timestamp:

Apr 30, 2022, 4:30:17 PM (4 years ago)

Author:

eugene

Message:

added -psf option; fpcamera seems to work quite well now if supplied the psf file measured for the chip

File:

• branches/eam_branches/ipp-20220316/fpcamera/src/fpcameraAnalysis.c (modified) (4 diffs)

branches/eam_branches/ipp-20220316/fpcamera/src/fpcameraAnalysis.c

@@ -20 +20 @@
 
     // loop over the input images
-    pmFPAfile *input = psMetadataLookupPtr (NULL, config->files, "FPCAMERA.INPUT");
+    pmFPAfile *input = psMetadataLookupPtr (&status, config->files, "FPCAMERA.INPUT");
     if (!input) ESCAPE(FPCAMERA_ERR_CONFIG, "Can't find or interpret output file rule FPCAMERA.INPUT!");
 
     // astrometry reference (smf)
-    pmFPAfile *astrom = psMetadataLookupPtr (NULL, config->files, "FPCAMERA.INPUT.ASTROM");
+    pmFPAfile *astrom = psMetadataLookupPtr (&status, config->files, "FPCAMERA.INPUT.ASTROM");
     if (!astrom) ESCAPE(FPCAMERA_ERR_CONFIG, "Can't find or interpret output file rule FPCAMERA.INPUT.ASTROM!");
 
@@ -33 +33 @@
     pmFPAfileActivate (config->files, true, "FPCAMERA.INPUT.VARIANCE");
     pmFPAfileActivate (config->files, true, "FPCAMERA.RESID");
-    // Note FPCAMERA.RESID is tied to FPCAMERA.INPUT so they must be active in the same block.
+    pmFPAfileActivate (config->files, true, "PSPHOT.PSF.LOAD"); // if this file is defined, we need to activate it now
+    // Note: the output file FPCAMERA.RESID is tied to FPCAMERA.INPUT so they must be active in the same block.
 
     view = pmFPAviewAlloc (0);
@@ -57 +58 @@
 
                 fpcameraChooseRefstars (input, astrom, view);
+
+                // Provide a simple (wrong) PSF as a default if psf model is not supplied with -psf or -psflist.
+                // The user-supplied psf model will replace this one on a chip-by-chip basis
+                // pmPSF *psf = pmPSFBuildSimple ("PS_MODEL_PS1_V1", 5.0, 5.0, 0.0, 0.5);
+                pmPSF *psf = pmPSFBuildSimple ("PS_MODEL_GAUSS", 5.0, 5.0, 0.0);
+                psf->fieldNx = readout->image->numCols;
+                psf->fieldNy = readout->image->numRows;
+                psMetadataAddPtr (readout->analysis, PS_LIST_TAIL, "PSPHOT.PSF", PS_META_REPLACE | PS_DATA_UNKNOWN, "psphot PSF model", psf);
+                psFree (psf);
+
+                if (!psphotForcedReadout (config, view, "FPCAMERA.INPUT")) ESCAPE(FPCAMERA_ERR_DATA, "failure in psphotForcedReadout");
             }
+            // drop all versions of the internal files
+            status = true;
+            status &= pmFPAfileDropInternal (config->files, "PSPHOT.BACKMDL");
+            status &= pmFPAfileDropInternal (config->files, "PSPHOT.BACKMDL.STDEV");
+            status &= pmFPAfileDropInternal (config->files, "PSPHOT.BACKGND");
+            if (!status) ESCAPE(FPCAMERA_ERR_PROG, "trouble dropping internal files");
         }
         if (!pmFPAfileIOChecks (config, view, PM_FPA_AFTER)) ESCAPE(FPCAMERA_ERR_IO, "failure in IOChecks(AFTER) at Chip");
@@ -72 +90 @@
 // chip->process is set (unset) based on command-line -chip selections (in fpcameraArguments)
 // chip->file_exists is set (in pmFPAFlags.c:pmChipSetFileStatus) by pmFPAfileDefineFromArgs (in pmFPAAddSource...)
+
+/*
+        // XXX set sxx, etc from FWHM in recipe
+        pmPSF *psf = pmPSFBuildSimple (modelNames->data[0], 1.0, 1.0, 0.0, 1.0);
+        psf->fieldNx = readout->image->numCols;
+        psf->fieldNy = readout->image->numRows;
+        psFree (modelNames);
+
+*/