Changeset 42186 for branches/eam_branches/ipp-20220316/fpcamera/src/fpcameraParseCamera.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/fpcameraParseCamera.c (modified) (3 diffs)

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

@@ -19 +19 @@
     if (!status) ESCAPE (PS_ERR_UNKNOWN, "failed to load find definition");
 
+    pmFPAfile *psphotInput = pmFPAfileDefineFromFile (config, input, 1, 1, "PSPHOT.INPUT");
+    if (!psphotInput) ESCAPE(FPCAMERA_ERR_CONFIG, "Failed to define FPA for PSPHOT.INPUT");
+
     if (!psphotSetMaskBits (config)) ESCAPE (PS_ERR_UNKNOWN, "failed to set mask bit values");
 
@@ -24 +27 @@
     pmFPAfileDefineFromArgs (&status, config, "FPCAMERA.INPUT.ASTROM", "INPUT.ASTROM");
     if (!status) ESCAPE(FPCAMERA_ERR_CONFIG, "Failed to build FPA from FPCAMERA.INPUT.ASTROM");
+
+    // if optional PSF model is supplied, associate with input file
+    if (psMetadataLookupPtr(NULL, config->arguments, "INPUT.PSF")) {
+        pmFPAfileBindFromArgs(&status, input, config, "PSPHOT.PSF.LOAD", "INPUT.PSF");
+        if (!status) ESCAPE(FPCAMERA_ERR_CONFIG, "Failed to find/build PSPHOT.PSF.LOAD");
+    }
 
     // select the current recipe
@@ -56 +65 @@
     return true;
 }
+