Changeset 26837 for branches/eam_branches/20091201/ppViz/src/ppVizPattern/ppVizPatternCamera.c

Timestamp:

Feb 9, 2010, 8:24:35 PM (16 years ago)

Author:

Paul Price

Message:

Adding ppVizPattern to visualise pattern correction from pattern output.

Location:

branches/eam_branches/20091201/ppViz

Files:

• . (copied) (copied from trunk/ppViz ) (1 prop)
• src/ppVizPattern (copied) (copied from trunk/ppViz/src/ppVizPSF )
• src/ppVizPattern/ppVizPatternCamera.c (copied) (copied from trunk/ppViz/src/ppVizPSF/ppVizPSFCamera.c ) (3 diffs)

branches/eam_branches/20091201/ppViz/src/ppVizPattern/ppVizPatternCamera.c

@@ -7 +7 @@
 #include <psmodules.h>
 
-#include "ppVizPSF.h"
+#include "ppVizPattern.h"
 
 /// Add a single filename to the arguments as an array, so that it can be used with pmFPAfileBindFromArgs, etc
@@ -27 +27 @@
 
 
-bool ppVizPSFCamera(ppVizPSFData *data // Run-time data
+bool ppVizPatternCamera(ppVizPatternData *data // Run-time data
     )
 {
     bool status;                        // Status of file definition
 
-    fileArguments("PSF", data->psfName, "Input PSF", data->config);
-    pmFPAfile *psf = pmFPAfileDefineFromArgs(&status, data->config, "PSPHOT.PSF.LOAD", "PSF"); // File
-    if (!status || !psf) {
-        psError(PS_ERR_IO, false, "Failed to build file from PSPHOT.LOAD.PSF");
+    fileArguments("PATTERN", data->patternName, "Input pattern", data->config);
+    pmFPAfile *input = pmFPAfileDefineFromArgs(&status, data->config, "PPVIZPATTERN.INPUT",
+                                               "PATTERN"); // File
+    if (!status || !input) {
+        psError(PS_ERR_IO, false, "Failed to build file from PPVIZPATTERN.INPUT");
         return false;
     }
 
-    if (data->sourcesName) {
-        fileArguments("SOURCES", data->sourcesName, "Input sources", data->config);
-        pmFPAfile *srcs = pmFPAfileBindFromArgs(&status, psf, data->config,
-                                                "PSPHOT.INPUT.CMF", "SOURCES"); // File
-        if (!status || !srcs) {
-            psError(PS_ERR_IO, false, "Failed to build file from PSPHOT.INPUT.CMF");
-            return false;
-        }
-    }
-
-    pmFPAfile *output = pmFPAfileDefineOutput(data->config, psf->fpa, "PPVIZPSF.OUTPUT");
+    pmFPAfile *output = pmFPAfileDefineOutput(data->config, input->fpa, "PPVIZPATTERN.OUTPUT");
     if (!output) {
         psError(psErrorCodeLast(), false, "Unable to define output.");
@@ -56 +47 @@
     output->save = true;
 
+#if 0
     // Now the camera has been determined, we can read the recipe
-    psMetadata *recipe = psMetadataLookupMetadata(NULL, data->config->recipes, PPVIZPSF_RECIPE); // Recipe
+    psMetadata *recipe = psMetadataLookupMetadata(NULL, data->config->recipes, PPVIZPATTERN_RECIPE); // Recipe
     if (!recipe) {
-        psError(PS_ERR_UNEXPECTED_NULL, false, "Unable to find recipe %s", PPVIZPSF_RECIPE);
+        psError(PS_ERR_UNEXPECTED_NULL, false, "Unable to find recipe %s", PPVIZPATTERN_RECIPE);
         return false;
     }
-
-    data->minFlux = psMetadataLookupF32(NULL, recipe, "MINFLUX"); // Minimum flux
-    if (!isfinite(data->minFlux) || data->minFlux <= 0) {
-        psError(PS_ERR_BAD_PARAMETER_VALUE, true, "Unable to find legitimate value for MINFLUX");
-        return false;
-    }
-
-    if (!data->sourcesName) {
-        data->size = psMetadataLookupS32(NULL, recipe, "SIZE"); // Size of PSF
-        if (data->size <= 0) {
-            psError(PS_ERR_BAD_PARAMETER_VALUE, true, "Unable to find legitimate value for SIZE");
-            return false;
-        }
-    }
+#endif
 
     return true;