Changeset 28013 for trunk/psModules/src/objects/pmSourceIO.c

Timestamp:

May 18, 2010, 4:11:53 PM (16 years ago)

Author:

eugene

Message:

merge changes from branches/eam_branches/psphot,psModules.20100506 (finish basic psphotStack)

Location:

trunk/psModules

Files:

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

trunk/psModules/src/objects/pmSourceIO.c

@@ -539 +539 @@
                 status &= pmSourcesWrite_CMF_PS1_V2 (file->fits, readout, sources, file->header, outhead, dataname);
             }
+            if (!strcmp (exttype, "PS1_SV1")) {
+                status &= pmSourcesWrite_CMF_PS1_SV1 (file->fits, readout, sources, file->header, outhead, dataname, recipe);
+            }
             if (!strcmp (exttype, "PS1_DV1")) {
                 status &= pmSourcesWrite_CMF_PS1_DV1 (file->fits, readout, sources, file->header, outhead, dataname);
@@ -556 +559 @@
                     status &= pmSourcesWrite_CMF_PS1_V2_XSRC (file->fits, readout, sources, file->header, xsrcname, recipe);
                 }
+                if (!strcmp (exttype, "PS1_SV1")) {
+                    status &= pmSourcesWrite_CMF_PS1_SV1_XSRC (file->fits, readout, sources, file->header, xsrcname, recipe);
+                }
                 if (!strcmp (exttype, "PS1_DV1")) {
                     status &= pmSourcesWrite_CMF_PS1_DV1_XSRC (file->fits, readout, sources, file->header, xsrcname, recipe);
@@ -573 +579 @@
                     status &= pmSourcesWrite_CMF_PS1_V2_XFIT (file->fits, readout, sources, xfitname);
                 }
+                if (!strcmp (exttype, "PS1_SV1")) {
+                    status &= pmSourcesWrite_CMF_PS1_SV1_XFIT (file->fits, readout, sources, xfitname);
+                }
                 if (!strcmp (exttype, "PS1_DV1")) {
                     status &= pmSourcesWrite_CMF_PS1_DV1_XFIT (file->fits, readout, sources, xfitname);
@@ -981 +990 @@
         // we need to find the corresponding table EXTNAME.
         // first check the header
-        char *extdata = psMetadataLookupStr (NULL, hdu->header, "EXTDATA");
+        char *extdata = psMetadataLookupStr (&status, hdu->header, "EXTDATA");
         if (extdata) {
             // if EXTDATA is defined in the header, use that value for 'dataname'
@@ -1023 +1032 @@
             if (!strcmp (exttype, "PS1_V2")) {
                 sources = pmSourcesRead_CMF_PS1_V2 (file->fits, hdu->header);
+            }
+            if (!strcmp (exttype, "PS1_SV1")) {
+                sources = pmSourcesRead_CMF_PS1_SV1 (file->fits, hdu->header);
             }
             if (!strcmp (exttype, "PS1_DV1")) {