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

Timestamp:

May 30, 2013, 2:29:11 PM (13 years ago)

Author:

bills

Message:

Handle potential incompatabilities between cmf files and current psphot recipe.
When reading XSRC or XRAD extensions from cmf file save the vectors for
RADIAL.ANNULAR.BINS.LOWER and RADIAL.ANNULAR.BINS.UPPER on the readout->analysis.
Then when writing the output cmf use those values (if they exist) and if not fall
back to the current recipe. The latter case will be used when the XSRC and XRAD
analyses are done by the process and the former when the code is just passing through
results from input to output

File:

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

trunk/psModules/src/objects/pmSourceIO.c

@@ -58 +58 @@
 #define BLANK_HEADERS "BLANK.HEADERS"   // Name of metadata in camera configuration containing header names
                                         // for putting values into a blank PHU
-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 pmReadoutReadXSRC(pmFPAfile *file, pmReadout *readout, char * exttype, psMetadata *hduHeader, psString xsrcname, psArray *sources, long *sourceIndex);
+static bool pmReadoutReadXFIT(pmFPAfile *file, pmReadout *readout, 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);
 
@@ -1093 +1093 @@
             if (XSRC_OUTPUT && xsrcname) {
                 // a cmf file may have an XSRC extension, but it is not required
-                if (!pmReadoutReadXSRC(file, exttype, hdu->header, xsrcname, sources, sourceIndex)) {
+                if (!pmReadoutReadXSRC(file, readout, exttype, hdu->header, xsrcname, sources, sourceIndex)) {
                     // do anything?
                 }
@@ -1100 +1100 @@
             if (XFIT_OUTPUT && xfitname) {
                 // a cmf file may have an XFIT extension, but it is not required
-                if (!pmReadoutReadXFIT(file, exttype, hdu->header, xfitname, sources, sourceIndex)) {
+                if (!pmReadoutReadXFIT(file, readout, exttype, hdu->header, xfitname, sources, sourceIndex)) {
                     // do anything?
                 }
@@ -1243 +1243 @@
 // XXX: We might be able to macroize this and reuse for the other types
 
-static bool pmReadoutReadXSRC(pmFPAfile *file, char *exttype, psMetadata *hduHeader, psString xsrcname, psArray *sources, long *sourceIndex) 
+static bool pmReadoutReadXSRC(pmFPAfile *file, pmReadout *readout, char *exttype, psMetadata *hduHeader, psString xsrcname, psArray *sources, long *sourceIndex) 
 {
     if (!psFitsMoveExtNameClean (file->fits, xsrcname)) {
@@ -1263 +1263 @@
 # define PM_SOURCES_READ_XSRC(NAME,TYPE)                                \
     if (!strcmp (exttype, NAME)) {                                      \
-        status = pmSourcesRead_##TYPE##_XSRC(file->fits, hduHeader, sources, sourceIndex); \
+        status = pmSourcesRead_##TYPE##_XSRC(file->fits, readout, hduHeader, tableHeader, sources, sourceIndex); \
     }                                                                   
 
@@ -1282 +1282 @@
 }
 
-static bool pmReadoutReadXFIT(pmFPAfile *file, char *exttype, psMetadata *hduHeader, psString extname, psArray *sources, long *sourceIndex) 
+static bool pmReadoutReadXFIT(pmFPAfile *file, pmReadout *readout, char *exttype, psMetadata *hduHeader, psString extname, psArray *sources, long *sourceIndex) 
 {
     if (!psFitsMoveExtNameClean (file->fits, extname)) {
@@ -1302 +1302 @@
 # define PM_SOURCES_READ_XFIT(NAME,TYPE)                                \
     if (!strcmp (exttype, NAME)) {                                      \
-        status = pmSourcesRead_##TYPE##_XFIT(file->fits, hduHeader, sources, sourceIndex); \
+        status = pmSourcesRead_##TYPE##_XFIT(file->fits, readout, hduHeader, tableHeader, sources, sourceIndex); \
     }                                                                   
 
@@ -1340 +1340 @@
 # define PM_SOURCES_READ_XRAD(NAME,TYPE)                                \
     if (!strcmp (exttype, NAME)) {                                      \
-        status = pmSourcesRead_##TYPE##_XRAD(file->fits, readout, hduHeader, sources, sourceIndex); \
+        status = pmSourcesRead_##TYPE##_XRAD(file->fits, readout, hduHeader, tableHeader, sources, sourceIndex); \
     }