Changeset 11339

Timestamp:

Jan 26, 2007, 5:33:37 PM (19 years ago)

Author:

Paul Price

Message:

Fixing problem with mosaicked versions of cameras --- they have file->format set, but they aren't supposed to have pmFPACopy run on them. Solution is to check if the file->camera is the default camera; if not, then don't do any copy in pmFPAfileSuitableFPA.

Location:

trunk/psModules/src/camera

Files:

• pmFPAfileFitsIO.c (modified) (4 diffs)
• pmFPAfileFitsIO.h (modified) (3 diffs)
• pmFPAfileIO.c (modified) (2 diffs)

trunk/psModules/src/camera/pmFPAfileFitsIO.c

@@ -18 +18 @@
 #include "pmFPACopy.h"
 
-pmFPA *pmFPAfileSuitableFPA(const pmFPAfile *file, const pmFPAview *view)
+pmFPA *pmFPAfileSuitableFPA(const pmFPAfile *file, const pmFPAview *view, const pmConfig *config)
 {
     PS_ASSERT_PTR_NON_NULL(file, NULL);
     PS_ASSERT_PTR_NON_NULL(view, NULL);
 
-    if (!file->format) {
+    if (file->camera == config->camera || // Need to mosaic, not copy
+            !file->format) {                // Working with the same output format as input format
         return psMemIncrRefCounter(file->fpa);
     }
@@ -225 +226 @@
 static bool fpaViewWriteFitsImage(const pmFPAview *view, // FPA view, specifying the level of interest
                                   pmFPAfile *file, // FPA file of interest
+                                  const pmConfig *config, // Configuration
                                   bool (*fpaWriteFunc)(pmFPA*, psFits*, psDB*, bool, bool), // Func for FPA
                                   bool (*chipWriteFunc)(pmChip*, psFits*, psDB*, bool, bool), // Func for chip
@@ -236 +238 @@
     PS_ASSERT_PTR_NON_NULL(fits, false);
 
-    pmFPA *fpa = pmFPAfileSuitableFPA(file, view); // FPA to write
+    pmFPA *fpa = pmFPAfileSuitableFPA(file, view, config); // FPA to write
 
     switch (pmFPAviewLevel(view)) {
@@ -284 +286 @@
 }
 
-bool pmFPAviewWriteFitsImage(const pmFPAview *view, pmFPAfile *file)
-{
-    PS_ASSERT_PTR_NON_NULL(view, false);
-    PS_ASSERT_PTR_NON_NULL(file, false);
-    return fpaViewWriteFitsImage(view, file, pmFPAWrite, pmChipWrite, pmCellWrite);
-}
-
-bool pmFPAviewWriteFitsMask(const pmFPAview *view, pmFPAfile *file)
-{
-    PS_ASSERT_PTR_NON_NULL(view, false);
-    PS_ASSERT_PTR_NON_NULL(file, false);
-    return fpaViewWriteFitsImage(view, file, pmFPAWriteMask, pmChipWriteMask, pmCellWriteMask);
-}
-
-bool pmFPAviewWriteFitsWeight(const pmFPAview *view, pmFPAfile *file)
-{
-    PS_ASSERT_PTR_NON_NULL(view, false);
-    PS_ASSERT_PTR_NON_NULL(file, false);
-    return fpaViewWriteFitsImage(view, file, pmFPAWriteWeight, pmChipWriteWeight, pmCellWriteWeight);
+bool pmFPAviewWriteFitsImage(const pmFPAview *view, pmFPAfile *file, pmConfig *config)
+{
+    PS_ASSERT_PTR_NON_NULL(view, false);
+    PS_ASSERT_PTR_NON_NULL(file, false);
+    return fpaViewWriteFitsImage(view, file, config, pmFPAWrite, pmChipWrite, pmCellWrite);
+}
+
+bool pmFPAviewWriteFitsMask(const pmFPAview *view, pmFPAfile *file, pmConfig *config)
+{
+    PS_ASSERT_PTR_NON_NULL(view, false);
+    PS_ASSERT_PTR_NON_NULL(file, false);
+    return fpaViewWriteFitsImage(view, file, config, pmFPAWriteMask, pmChipWriteMask, pmCellWriteMask);
+}
+
+bool pmFPAviewWriteFitsWeight(const pmFPAview *view, pmFPAfile *file, pmConfig *config)
+{
+    PS_ASSERT_PTR_NON_NULL(view, false);
+    PS_ASSERT_PTR_NON_NULL(file, false);
+    return fpaViewWriteFitsImage(view, file, config, pmFPAWriteWeight, pmChipWriteWeight, pmCellWriteWeight);
 }
 

trunk/psModules/src/camera/pmFPAfileFitsIO.h

@@ -5 +5 @@
  * @author PAP, IfA
  *
- * @version $Revision: 1.5 $ $Name: not supported by cvs2svn $
- * @date $Date: 2007-01-24 03:11:19 $
+ * @version $Revision: 1.6 $ $Name: not supported by cvs2svn $
+ * @date $Date: 2007-01-27 03:33:37 $
  * Copyright 2004-2005 Institute for Astronomy, University of Hawaii
  */
@@ -32 +32 @@
 /// Write the image for the specified view
 bool pmFPAviewWriteFitsImage(const pmFPAview *view, ///< View specifying level of interest
-                             pmFPAfile *file ///< FPA file to write
+                             pmFPAfile *file, ///< FPA file to write
+                             pmConfig *config ///< Configuration
                             );
 
 /// Write the mask for the specified view
 bool pmFPAviewWriteFitsMask(const pmFPAview *view, ///< View specifying level of interest
-                            pmFPAfile *file ///< FPA file to write
+                            pmFPAfile *file, ///< FPA file to write
+                            pmConfig *config ///< Configuration
                            );
 
 /// Write the weight map for the specified view
 bool pmFPAviewWriteFitsWeight(const pmFPAview *view, ///< View specifying level of interest
-                              pmFPAfile *file ///< FPA file to write
+                              pmFPAfile *file, ///< FPA file to write
+                              pmConfig *config ///< Configuration
                              );
 
@@ -64 +67 @@
 /// Produce a suitable FPA for writing, on the basis of the input FPAfile
 ///
-/// A format change is done is required.  Otherwise the file->fpa is returned (incremented).
+/// A new FPA with a changed format is generated if required (file->format is set and file->camera is equal to
+/// the default, indicating a change in the format without changing the camera --- changes to the camera are
+/// handled using other systems --- see pmFPAfileDefineChipMosaic, pmFPAfileDefineFPAMosaic).  Otherwise the
+/// file->fpa is returned (incremented).
 pmFPA *pmFPAfileSuitableFPA(const pmFPAfile *file,///< File containing the fpa
-                            const pmFPAview *view ///< View at which to produce the fpa
+                            const pmFPAview *view, ///< View at which to produce the fpa
+                            const pmConfig *config ///< Configuration
                            );
 

trunk/psModules/src/camera/pmFPAfileIO.c

@@ -109 +109 @@
     if (file->mode == PM_FPA_MODE_WRITE) {
         // Want to write out any potential blank
-        pmFPA *fpa = pmFPAfileSuitableFPA(file, view);
+        pmFPA *fpa = pmFPAfileSuitableFPA(file, view, config);
 
         switch (file->fileLevel) {
@@ -510 +510 @@
     switch (file->type) {
     case PM_FPA_FILE_IMAGE:
-        pmFPAviewWriteFitsImage(view, file);
+        pmFPAviewWriteFitsImage(view, file, config);
         psTrace ("pmFPAfile", 5, "wrote image %s (fpa: %p)\n", file->filename, file->fpa);
         break;
     case PM_FPA_FILE_MASK:
-        pmFPAviewWriteFitsMask(view, file);
+        pmFPAviewWriteFitsMask(view, file, config);
         psTrace ("pmFPAfile", 5, "wrote mask %s (fpa: %p)\n", file->filename, file->fpa);
         break;
     case PM_FPA_FILE_WEIGHT:
-        pmFPAviewWriteFitsWeight(view, file);
+        pmFPAviewWriteFitsWeight(view, file, config);
         psTrace ("pmFPAfile", 5, "wrote weight %s (fpa: %p)\n", file->filename, file->fpa);
         break;
     case PM_FPA_FILE_FRINGE:
-        pmFPAviewWriteFitsImage (view, file);
+        pmFPAviewWriteFitsImage (view, file, config);
         psTrace ("pmFPAfile", 5, "wrote image %s (fpa: %p)\n", file->filename, file->fpa);
         pmFPAviewWriteFitsTable(view, file, "FRINGE");