Changeset 19307

Timestamp:

Sep 2, 2008, 9:06:17 AM (18 years ago)

Author:

eugene

Message:

adding WCS file type to load astrometry info without loading sources

Location:

trunk/psModules/src

Files:

• camera/pmFPAfile.c (modified) (2 diffs)
• camera/pmFPAfile.h (modified) (2 diffs)
• camera/pmFPAfileIO.c (modified) (7 diffs)
• objects/pmSourceIO.c (modified) (3 diffs)

trunk/psModules/src/camera/pmFPAfile.c

@@ -452 +452 @@
         return PM_FPA_FILE_CMF;
     }
+    if (!strcasecmp(type, "WCS"))     {
+        return PM_FPA_FILE_WCS;
+    }
     if (!strcasecmp(type, "RAW"))     {
         return PM_FPA_FILE_RAW;
@@ -510 +513 @@
       case PM_FPA_FILE_CMF:
         return ("CMF");
+      case PM_FPA_FILE_WCS:
+        return ("WCS");
       case PM_FPA_FILE_RAW:
         return ("RAW");

trunk/psModules/src/camera/pmFPAfile.h

@@ -4 +4 @@
  * @author EAM, IfA
  *
- * @version $Revision: 1.32 $ $Name: not supported by cvs2svn $
- * @date $Date: 2008-08-25 22:14:04 $
+ * @version $Revision: 1.33 $ $Name: not supported by cvs2svn $
+ * @date $Date: 2008-09-02 19:06:16 $
  * Copyright 2004-2005 Institute for Astronomy, University of Hawaii
  */
@@ -33 +33 @@
     PM_FPA_FILE_CMP,
     PM_FPA_FILE_CMF,
+    PM_FPA_FILE_WCS,
     PM_FPA_FILE_RAW,
     PM_FPA_FILE_IMAGE,

trunk/psModules/src/camera/pmFPAfileIO.c

@@ -197 +197 @@
       case PM_FPA_FILE_CMP:
       case PM_FPA_FILE_CMF:
+      case PM_FPA_FILE_WCS:
         status = pmFPAviewReadObjects (view, file, config);
         break;
@@ -289 +290 @@
       case PM_FPA_FILE_CMP:
       case PM_FPA_FILE_CMF:
+      case PM_FPA_FILE_WCS:
       case PM_FPA_FILE_PSF:
       case PM_FPA_FILE_ASTROM_MODEL:
@@ -471 +473 @@
         status = pmFPAviewWriteSourcePlot (view, file, config);
         break;
+
+      case PM_FPA_FILE_WCS:
+        psError(PS_ERR_IO, true, "cannot write type WCS (%s)", file->name);
+        return false;
 
       default:
@@ -522 +528 @@
       case PM_FPA_FILE_SUBKERNEL:
       case PM_FPA_FILE_CMF:
+      case PM_FPA_FILE_WCS:
       case PM_FPA_FILE_PSF:
       case PM_FPA_FILE_ASTROM_MODEL:
@@ -592 +599 @@
       case PM_FPA_FILE_CMP:
       case PM_FPA_FILE_CMF:
+      case PM_FPA_FILE_WCS:
       case PM_FPA_FILE_PSF:
       case PM_FPA_FILE_ASTROM_MODEL:
@@ -732 +740 @@
       case PM_FPA_FILE_SUBKERNEL:
       case PM_FPA_FILE_CMF:
+      case PM_FPA_FILE_WCS:
       case PM_FPA_FILE_PSF:
       case PM_FPA_FILE_ASTROM_MODEL:
@@ -926 +935 @@
       case PM_FPA_FILE_OBJ:
       case PM_FPA_FILE_CMP:
+      case PM_FPA_FILE_WCS:
       case PM_FPA_FILE_JPEG:
       case PM_FPA_FILE_KAPA:

trunk/psModules/src/objects/pmSourceIO.c

@@ -3 +3 @@
  *  @author EAM, IfA
  *
- *  @version $Revision: 1.64 $ $Name: not supported by cvs2svn $
- *  @date $Date: 2008-08-16 22:36:18 $
+ *  @version $Revision: 1.65 $ $Name: not supported by cvs2svn $
+ *  @date $Date: 2008-09-02 19:06:17 $
  *
  *  Copyright 2004 Maui High Performance Computing Center, University of Hawaii
@@ -845 +845 @@
 
       case PM_FPA_FILE_CMF:
+      case PM_FPA_FILE_WCS:  // "WCS" is CMF without detected objects
         // read in header, if not yet loaded
         hdu = pmFPAviewThisHDU (view, file->fpa);
@@ -905 +906 @@
 
         // XXX these are case-sensitive since the EXTYPE is case-sensitive
-        if (!strcmp (exttype, "SMPDATA")) {
-            sources = pmSourcesRead_SMPDATA (file->fits, hdu->header);
-        }
-        if (!strcmp (exttype, "PS1_DEV_0")) {
-            sources = pmSourcesRead_PS1_DEV_0 (file->fits, hdu->header);
-        }
-        if (!strcmp (exttype, "PS1_DEV_1")) {
-            sources = pmSourcesRead_PS1_DEV_1 (file->fits, hdu->header);
-        }
+        if (file->type == PM_FPA_FILE_CMF) {
+            if (!strcmp (exttype, "SMPDATA")) {
+                sources = pmSourcesRead_SMPDATA (file->fits, hdu->header);
+            }
+            if (!strcmp (exttype, "PS1_DEV_0")) {
+                sources = pmSourcesRead_PS1_DEV_0 (file->fits, hdu->header);
+            }
+            if (!strcmp (exttype, "PS1_DEV_1")) {
+                sources = pmSourcesRead_PS1_DEV_1 (file->fits, hdu->header);
+            }
+        }
 
         psTrace("psModules.objects", 6, "read CMF table from %s : %s : %s", file->filename, headname, dataname);