Changeset 6859 for branches/rel10_ifa/psModules/src/astrom/pmFPAfile.c

Timestamp:

Apr 14, 2006, 11:43:59 AM (20 years ago)

Author:

magnier

Message:

added JPEG and PSF I/O methods to pmFPAfile, added pmSourcePixelWeights

File:

• branches/rel10_ifa/psModules/src/astrom/pmFPAfile.c (modified) (8 diffs)

branches/rel10_ifa/psModules/src/astrom/pmFPAfile.c

@@ -11 +11 @@
 #include "pmFPARead.h"
 #include "pmFPAWrite.h"
-#include "pmFPAviewObjectsIO.h"
+#include "pmPeaks.h"
+#include "pmMoments.h"
+#include "pmModel.h"
+#include "pmSource.h"
+#include "pmSourceIO.h"
+#include "pmGrowthCurve.h"
+#include "pmPSF.h"
+#include "pmPSF_IO.h"
+#include "pmFPA_JPEG.h"
 
 static void pmFPAfileFree (pmFPAfile *file)
@@ -173 +181 @@
         if (!strcasecmp (type, "IMAGE"))     {
             file->type = PM_FPA_FILE_IMAGE;
+        }
+        if (!strcasecmp (type, "PSF"))     {
+            file->type = PM_FPA_FILE_PSF;
+        }
+        if (!strcasecmp (type, "JPEG"))     {
+            file->type = PM_FPA_FILE_JPEG;
         }
     }
@@ -294 +308 @@
     case PM_FPA_FILE_CMP:
     case PM_FPA_FILE_RAW:
+    case PM_FPA_FILE_PSF:
+    case PM_FPA_FILE_JPEG:
         psTrace ("pmFPAfile", 5, "not opening %s (type: %d)\n", file->filename, file->type);
         break;
@@ -339 +355 @@
         break;
 
+    case PM_FPA_FILE_PSF:
+        pmFPAviewReadPSFmodel (view, file);
+        psTrace ("pmFPAfile", 5, "reading %s (type: %d)\n", file->filename, file->type);
+        break;
+
+    case PM_FPA_FILE_JPEG:
+        break;
+
     default:
         fprintf (stderr, "warning: type mismatch\n");
@@ -378 +402 @@
         break;
 
+    case PM_FPA_FILE_PSF:
+        pmFPAviewWritePSFmodel (view, file);
+        psTrace ("pmFPAfile", 5, "wrote PSF %s (fpa: %p)\n", file->filename, file->fpa);
+        break;
+
+    case PM_FPA_FILE_JPEG:
+        pmFPAviewWriteJPEG (view, file);
+        psTrace ("pmFPAfile", 5, "wrote PSF %s (fpa: %p)\n", file->filename, file->fpa);
+        break;
+
     default:
         fprintf (stderr, "warning: type mismatch\n");
@@ -414 +448 @@
     case PM_FPA_FILE_CMP:
     case PM_FPA_FILE_CMF:
+    case PM_FPA_FILE_PSF:
+    case PM_FPA_FILE_JPEG:
         break;
 
@@ -453 +489 @@
     case PM_FPA_FILE_OBJ:
     case PM_FPA_FILE_CMP:
+    case PM_FPA_FILE_PSF:
+    case PM_FPA_FILE_JPEG:
         break;
 
@@ -775 +813 @@
     // load the given filerule (from config->camera) and associate it with the fpa
     // the output file is just a view to the file on config->files
+    // XXX the filenames placed on config->files should include the seq number
     file = pmFPAfileDefine (config->files, config->camera, fpa, filename);
     if (!file) {