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

Timestamp:

Dec 19, 2011, 3:12:24 PM (15 years ago)

Author:

bills

Message:

pass readout down to the Read XRAD functions so that we can save the
fwhmValues vector on the analysis metadata

File:

• trunk/psModules/src/objects/pmSourceIO.c (modified) (5 diffs)

trunk/psModules/src/objects/pmSourceIO.c

@@ -59 +59 @@
 static bool pmReadoutReadXSRC(pmFPAfile *file, char * exttype, psMetadata *hduHeader, psString xsrcname, psArray *sources, long *sourceIndex);
 static bool pmReadoutReadXFIT(pmFPAfile *file, char * exttype, psMetadata *hduHeader, psString xfitname, psArray *sources, long *sourceIndex);
-static bool pmReadoutReadXRAD(pmFPAfile *file, char * exttype, psMetadata *hduHeader, psString xfitname, psArray *sources, long *sourceIndex);
+static bool pmReadoutReadXRAD(pmFPAfile *file, pmReadout *readout, char * exttype, psMetadata *hduHeader, psString xfitname, psArray *sources, long *sourceIndex);
 
 // lookup the EXTNAME values used for table data and image header segments
@@ -1097 +1097 @@
             }
             if (XRAD_OUTPUT && xradname) {
-                if (!pmReadoutReadXRAD(file, exttype, hdu->header, xradname, sources, sourceIndex)) {
+                if (!pmReadoutReadXRAD(file, readout, exttype, hdu->header, xradname, sources, sourceIndex)) {
                     // XXX: is this an error?
                     psErrorClear();
@@ -1253 +1253 @@
     bool status = false;
     if (file->type == PM_FPA_FILE_CMF) {
-#ifdef notyet
-        if (!strcmp (exttype, "SMPDATA")) {
-            status  = pmSourcesRead_SMPDATA_XSRC (file->fits, hduHeader, sources);
-        }
-        if (!strcmp (exttype, "PS1_DEV_0")) {
-            status  = pmSourcesRead_PS1_DEV_0_XSRC (file->fits, hduHeader, sources);
-        }
-        if (!strcmp (exttype, "PS1_DEV_1")) {
-            status  = pmSourcesRead_PS1_DEV_1_XSRC (file->fits, hduHeader, sources);
-        }
-        if (!strcmp (exttype, "PS1_V1")) {
-            status  = pmSourcesRead_CMF_PS1_V1_XSRC (file->fits, hduHeader, sources);
-        }
-        if (!strcmp (exttype, "PS1_V2")) {
-            status  = pmSourcesRead_CMF_PS1_V2_XSRC (file->fits, hduHeader, sources);
-        }
-        if (!strcmp (exttype, "PS1_V3")) {
-            status  = pmSourcesRead_CMF_PS1_V3_XSRC (file->fits, hduHeader, sources);
-        }
-        if (!strcmp (exttype, "PS1_V4")) {
-            status  = pmSourcesRead_CMF_PS1_V4_XSRC (file->fits, hduHeader, sources);
-        }
-#endif // notyet
         if (!strcmp (exttype, "PS1_SV1")) {
             status  = pmSourcesRead_CMF_PS1_SV1_XSRC (file->fits, hduHeader, sources, sourceIndex);
         }
-#ifdef notyet
-        if (!strcmp (exttype, "PS1_DV1")) {
-            status  = pmSourcesRead_CMF_PS1_DV1_XSRC (file->fits, hduHeader, sources);
-        }
-        if (!strcmp (exttype, "PS1_DV2")) {
-            status  = pmSourcesRead_CMF_PS1_DV2_XSRC (file->fits, hduHeader, sources);
-        }
-#endif // notyet
     }
     psFree(tableHeader);
@@ -1312 +1281 @@
     bool status = false;
     if (file->type == PM_FPA_FILE_CMF) {
-#ifdef notyet
-        if (!strcmp (exttype, "SMPDATA")) {
-            status  = pmSourcesRead_SMPDATA_XFIT (file->fits, hduHeader, sources);
-        }
-        if (!strcmp (exttype, "PS1_DEV_0")) {
-            status  = pmSourcesRead_PS1_DEV_0_XFIT (file->fits, hduHeader, sources);
-        }
-        if (!strcmp (exttype, "PS1_DEV_1")) {
-            status  = pmSourcesRead_PS1_DEV_1_XFIT (file->fits, hduHeader, sources);
-        }
-        if (!strcmp (exttype, "PS1_V1")) {
-            status  = pmSourcesRead_CMF_PS1_V1_XFIT (file->fits, hduHeader, sources);
-        }
-        if (!strcmp (exttype, "PS1_V2")) {
-            status  = pmSourcesRead_CMF_PS1_V2_XFIT (file->fits, hduHeader, sources);
-        }
-        if (!strcmp (exttype, "PS1_V3")) {
-            status  = pmSourcesRead_CMF_PS1_V3_XFIT (file->fits, hduHeader, sources);
-        }
-        if (!strcmp (exttype, "PS1_V4")) {
-            status  = pmSourcesRead_CMF_PS1_V4_XFIT (file->fits, hduHeader, sources);
-        }
-#endif // notyet
         if (!strcmp (exttype, "PS1_SV1")) {
             status  = pmSourcesRead_CMF_PS1_SV1_XFIT (file->fits, hduHeader, sources, sourceIndex);
         }
-#ifdef notyet
-        if (!strcmp (exttype, "PS1_DV1")) {
-            status  = pmSourcesRead_CMF_PS1_DV1_XFIT (file->fits, hduHeader, sources);
-        }
-        if (!strcmp (exttype, "PS1_DV2")) {
-            status  = pmSourcesRead_CMF_PS1_DV2_XFIT (file->fits, hduHeader, sources);
-        }
-#endif // notyet
     }
     psFree(tableHeader);
     return status;
 }
-static bool pmReadoutReadXRAD(pmFPAfile *file, char *exttype, psMetadata *hduHeader, psString extname, psArray *sources, long *sourceIndex) 
+static bool pmReadoutReadXRAD(pmFPAfile *file, pmReadout *readout, char *exttype, psMetadata *hduHeader, psString extname, psArray *sources, long *sourceIndex) 
 {
     if (!psFitsMoveExtName (file->fits, extname)) {
@@ -1370 +1308 @@
     bool status = false;
     if (file->type == PM_FPA_FILE_CMF) {
-#ifdef notyet
-        if (!strcmp (exttype, "SMPDATA")) {
-            status  = pmSourcesRead_SMPDATA_XRAD (file->fits, hduHeader, sources);
-        }
-        if (!strcmp (exttype, "PS1_DEV_0")) {
-            status  = pmSourcesRead_PS1_DEV_0_XRAD (file->fits, hduHeader, sources);
-        }
-        if (!strcmp (exttype, "PS1_DEV_1")) {
-            status  = pmSourcesRead_PS1_DEV_1_XRAD (file->fits, hduHeader, sources);
-        }
-        if (!strcmp (exttype, "PS1_V1")) {
-            status  = pmSourcesRead_CMF_PS1_V1_XRAD (file->fits, hduHeader, sources);
-        }
-        if (!strcmp (exttype, "PS1_V2")) {
-            status  = pmSourcesRead_CMF_PS1_V2_XRAD (file->fits, hduHeader, sources);
-        }
-        if (!strcmp (exttype, "PS1_V3")) {
-            status  = pmSourcesRead_CMF_PS1_V3_XRAD (file->fits, hduHeader, sources);
-        }
-        if (!strcmp (exttype, "PS1_V4")) {
-            status  = pmSourcesRead_CMF_PS1_V4_XRAD (file->fits, hduHeader, sources);
-        }
-#endif // notyet
         if (!strcmp (exttype, "PS1_SV1")) {
-            status  = pmSourcesRead_CMF_PS1_SV1_XRAD (file->fits, hduHeader, sources, sourceIndex);
-        }
-#ifdef notyet
-        if (!strcmp (exttype, "PS1_DV1")) {
-            status  = pmSourcesRead_CMF_PS1_DV1_XRAD (file->fits, hduHeader, sources);
-        }
-        if (!strcmp (exttype, "PS1_DV2")) {
-            status  = pmSourcesRead_CMF_PS1_DV2_XRAD (file->fits, hduHeader, sources);
-        }
-#endif // notyet
+            status  = pmSourcesRead_CMF_PS1_SV1_XRAD (file->fits, readout, hduHeader, sources, sourceIndex);
+        }
     }
     psFree(tableHeader);