Changeset 17036 for trunk/psModules/src/camera/pmFPAfileIO.c

Timestamp:

Mar 18, 2008, 8:38:14 AM (18 years ago)

Author:

eugene

Message:

renaming pmAstrometryTable to pmAstrometryModel; adding pmAstrometryRefstars; using PS_DEG_RAD, PS_RAD_DEG

File:

• trunk/psModules/src/camera/pmFPAfileIO.c (modified) (10 diffs)

trunk/psModules/src/camera/pmFPAfileIO.c

@@ -34 +34 @@
 #include "pmResiduals.h"
 #include "pmPSF_IO.h"
-#include "pmAstrometryTable.h"
+#include "pmAstrometryModel.h"
+#include "pmAstrometryRefstars.h"
 #include "pmFPA_JPEG.h"
 #include "pmSourcePlots.h"
@@ -196 +197 @@
         status = pmPSFmodelReadForView (view, file, config);
         break;
-      case PM_FPA_FILE_ASTROM:
-        status = pmAstromReadForView (view, file, config);
-        break;
+      case PM_FPA_FILE_ASTROM_MODEL:
+        status = pmAstromModelReadForView (view, file, config);
+        break;
+      case PM_FPA_FILE_ASTROM_REFSTARS:
       case PM_FPA_FILE_JPEG:
       case PM_FPA_FILE_KAPA:
@@ -281 +283 @@
     case PM_FPA_FILE_CMF:
     case PM_FPA_FILE_PSF:
-    case PM_FPA_FILE_ASTROM:
+    case PM_FPA_FILE_ASTROM_MODEL:
+    case PM_FPA_FILE_ASTROM_REFSTARS:
     case PM_FPA_FILE_JPEG:
     case PM_FPA_FILE_KAPA:
@@ -357 +360 @@
       }
     }
-    if (file->type == PM_FPA_FILE_ASTROM) {
-      if (!pmAstromCheckDataStatusForView (view, file)) {
+    if (file->type == PM_FPA_FILE_ASTROM_MODEL) {
+      if (!pmAstromModelCheckDataStatusForView (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_ASTROM_REFSTARS) {
+      if (!pmAstromRefstarsCheckDataStatusForView (view, file)) {
         psTrace("psModules.camera", 6, "skip write for %s, no data for this entry", file->name);
         return true;
@@ -405 +414 @@
     fitsType |= (file->type == PM_FPA_FILE_CMF);
     fitsType |= (file->type == PM_FPA_FILE_PSF);
-    fitsType |= (file->type == PM_FPA_FILE_ASTROM);
+    fitsType |= (file->type == PM_FPA_FILE_ASTROM_MODEL);
+    fitsType |= (file->type == PM_FPA_FILE_ASTROM_REFSTARS);
 
     // Ensure headers and all are updated
@@ -481 +491 @@
         break;
 
-      case PM_FPA_FILE_ASTROM:
-        status = pmAstromWriteForView (view, file, config);
+      case PM_FPA_FILE_ASTROM_MODEL:
+        status = pmAstromModelWriteForView (view, file, config);
+        break;
+
+      case PM_FPA_FILE_ASTROM_REFSTARS:
+        status = pmAstromRefstarsWriteForView (view, file, config);
         break;
 
@@ -543 +557 @@
       case PM_FPA_FILE_CMF:
       case PM_FPA_FILE_PSF:
-      case PM_FPA_FILE_ASTROM:
+      case PM_FPA_FILE_ASTROM_MODEL:
+      case PM_FPA_FILE_ASTROM_REFSTARS:
         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);
@@ -611 +626 @@
       case PM_FPA_FILE_CMF:
       case PM_FPA_FILE_PSF:
-      case PM_FPA_FILE_ASTROM:
+      case PM_FPA_FILE_ASTROM_MODEL:
+      case PM_FPA_FILE_ASTROM_REFSTARS:
         psTrace ("psModules.camera", 5, "NOT freeing %s (%s) : save for further analysis\n", file->filename, file->name);
         return true;
@@ -749 +765 @@
       case PM_FPA_FILE_CMF:
       case PM_FPA_FILE_PSF:
-      case PM_FPA_FILE_ASTROM:
+      case PM_FPA_FILE_ASTROM_MODEL:
+      case PM_FPA_FILE_ASTROM_REFSTARS:
         psTrace ("psModules.camera", 5, "opening %s (%s) (%d:%d:%d)\n",
                  file->filename, file->name, view->chip, view->cell, view->readout);
@@ -922 +939 @@
         status = pmPSFmodelWritePHU (view, file, config);
         break;
-      case PM_FPA_FILE_ASTROM:
+      case PM_FPA_FILE_ASTROM_REFSTARS:
+        status = pmAstromRefstarsWritePHU (view, file, config);
+        break;
+      case PM_FPA_FILE_ASTROM_MODEL:
       case PM_FPA_FILE_SX:
       case PM_FPA_FILE_RAW: