Changeset 15562 for trunk/psModules/src/camera

Timestamp:

Nov 9, 2007, 3:09:20 PM (19 years ago)

Author:

eugene

Message:

updating all changes from from eam_branch_20071023

Location:

trunk/psModules/src/camera

Files:

• pmFPAfile.h (modified) (2 diffs)
• pmFPAfileDefine.c (modified) (3 diffs)
• pmFPAfileIO.c (modified) (10 diffs)

trunk/psModules/src/camera/pmFPAfile.h

@@ -4 +4 @@
  * @author EAM, IfA
  *
- * @version $Revision: 1.22 $ $Name: not supported by cvs2svn $
- * @date $Date: 2007-10-03 21:32:43 $
+ * @version $Revision: 1.23 $ $Name: not supported by cvs2svn $
+ * @date $Date: 2007-11-10 01:09:20 $
  * Copyright 2004-2005 Institute for Astronomy, University of Hawaii
  */
@@ -35 +35 @@
     PM_FPA_FILE_FRINGE,
     PM_FPA_FILE_HEADER,
+    PM_FPA_FILE_ASTROM,
 } pmFPAfileType;
 

trunk/psModules/src/camera/pmFPAfileDefine.c

@@ -438 +438 @@
                 return NULL;
             }
+            // EXTWORD (fits->extword) is not relevant to the PHU
             fits = psFitsOpen (realName, "r");
             if (!fits) {
@@ -556 +557 @@
             return NULL;
         }
+        // EXTWORD (fits->extword) is not relevant to the PHU
         fits = psFitsOpen (realName, "r");
         if (!fits) {
@@ -665 +667 @@
     // associated each filename with an element of the FPA
     // save the association on file->names
+    // EXTWORD (fits->extword) is not relevant to the PHU
     fits = psFitsOpen (infiles->data[entry], "r");
     phu = psFitsReadHeader (NULL, fits);

trunk/psModules/src/camera/pmFPAfileIO.c

@@ -34 +34 @@
 #include "pmResiduals.h"
 #include "pmPSF_IO.h"
+#include "pmAstrometryTable.h"
 #include "pmFPA_JPEG.h"
 #include "pmSourcePlots.h"
@@ -192 +193 @@
         status = pmPSFmodelReadForView (view, file, config);
         break;
+      case PM_FPA_FILE_ASTROM:
+        status = pmAstromReadForView (view, file, config);
+        break;
       case PM_FPA_FILE_JPEG:
       case PM_FPA_FILE_KAPA:
@@ -273 +277 @@
     case PM_FPA_FILE_CMF:
     case PM_FPA_FILE_PSF:
+    case PM_FPA_FILE_ASTROM:
     case PM_FPA_FILE_JPEG:
     case PM_FPA_FILE_KAPA:
@@ -336 +341 @@
     // have their data stored on the readout->analysis metadata structure of another
     // (existing) fpa
+    if (file->type == PM_FPA_FILE_CMF) {
+      if (!pmFPAviewCheckDataStatusForSources (view, file)) {
+        psTrace("psModules.camera", 6, "skip write for %s, no data for this entry", file->name);
+        return true;
+      }
+    }
     if (file->type == PM_FPA_FILE_PSF) {
       if (!pmPSFmodelCheckDataStatusForView (view, file)) {
@@ -342 +353 @@
       }
     }
-    if (file->type == PM_FPA_FILE_CMF) {
-      if (!pmFPAviewCheckDataStatusForSources (view, file)) {
+    if (file->type == PM_FPA_FILE_ASTROM) {
+      if (!pmAstromCheckDataStatusForView (view, file)) {
         psTrace("psModules.camera", 6, "skip write for %s, no data for this entry", file->name);
         return true;
@@ -449 +460 @@
       case PM_FPA_FILE_PSF:
         status = pmPSFmodelWriteForView (view, file, config);
+        break;
+
+      case PM_FPA_FILE_ASTROM:
+        status = pmAstromWriteForView (view, file, config);
         break;
 
@@ -508 +523 @@
       case PM_FPA_FILE_CMF:
       case PM_FPA_FILE_PSF:
+      case PM_FPA_FILE_ASTROM:
         psTrace ("psModules.camera", 5, "closing %s (%s) (%d:%d:%d)\n", file->filename, file->name, view->chip, view->cell, view->readout);
         status = psFitsClose (file->fits);
@@ -574 +590 @@
       case PM_FPA_FILE_CMF:
       case PM_FPA_FILE_PSF:
+      case PM_FPA_FILE_ASTROM:
         psTrace ("psModules.camera", 5, "NOT freeing %s (%s) : save for further analysis\n", file->filename, file->name);
         return true;
@@ -712 +729 @@
       case PM_FPA_FILE_CMF:
       case PM_FPA_FILE_PSF:
+      case PM_FPA_FILE_ASTROM:
         psTrace ("psModules.camera", 5, "opening %s (%s) (%d:%d:%d)\n",
                  file->filename, file->name, view->chip, view->cell, view->readout);
@@ -861 +879 @@
         status = pmPSFmodelWritePHU (view, file, config);
         break;
+      case PM_FPA_FILE_ASTROM:
+        status = pmAstromWritePHU (view, file, config);
+        break;
       case PM_FPA_FILE_SX:
       case PM_FPA_FILE_RAW: