Changeset 25027 for branches/pap/psModules/src/objects/pmSourceIO.c

Timestamp:

Aug 7, 2009, 4:08:25 PM (17 years ago)

Author:

Paul Price

Message:

Merging trunk (r25026) to get up-to-date on old branch.

Location:

branches/pap

Files:

• . (modified) (1 prop)
• psModules (modified) (1 prop)
• psModules/src/objects/pmSourceIO.c (modified) (8 diffs)

branches/pap/psModules/src/objects/pmSourceIO.c

@@ -496 +496 @@
                 status = pmSourcesWrite_CMF_PS1_V1 (file->fits, readout, sources, file->header, outhead, dataname);
             }
+            if (!strcmp (exttype, "PS1_V2")) {
+                status = pmSourcesWrite_CMF_PS1_V2 (file->fits, readout, sources, file->header, outhead, dataname);
+            }
             if (xsrcname) {
               if (!strcmp (exttype, "PS1_DEV_1")) {
@@ -506 +509 @@
                   status = pmSourcesWrite_CMF_PS1_V1_XSRC (file->fits, sources, xsrcname, recipe);
               }
+              if (!strcmp (exttype, "PS1_V2")) {
+                  status = pmSourcesWrite_CMF_PS1_V2_XSRC (file->fits, sources, xsrcname, recipe);
+              }
             }
             if (xfitname) {
@@ -517 +523 @@
                   status = pmSourcesWrite_CMF_PS1_V1_XFIT (file->fits, sources, xfitname);
               }
+              if (!strcmp (exttype, "PS1_V2")) {
+                  status = pmSourcesWrite_CMF_PS1_V2_XFIT (file->fits, sources, xfitname);
+              }
             }
             if (!status) {
@@ -562 +571 @@
 
     // not needed if only one chip
-    if (file->fpa->chips->n == 1) return true;
-
+    if (file->fpa->chips->n == 1) {
+        pmSourceIO_WriteMatchedRefs (file->fits, file->fpa, config);
+        return true;
+    }
 
     // find the FPA phu
@@ -667 +678 @@
     psFree (outhead);
 
+    pmSourceIO_WriteMatchedRefs (file->fits, file->fpa, config);
     return true;
 }
@@ -679 +691 @@
 
     pmFPA *fpa = file->fpa;
+
+    pmSourceIO_ReadMatchedRefs (file->fits, fpa, config);
 
     if (view->chip == -1) {
@@ -941 +955 @@
                 sources = pmSourcesRead_CMF_PS1_V1 (file->fits, hdu->header);
             }
+            if (!strcmp (exttype, "PS1_V2")) {
+                sources = pmSourcesRead_CMF_PS1_V2 (file->fits, hdu->header);
+            }
         }
 
@@ -1053 +1070 @@
 }
 
+