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

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.h (modified) (1 diff)

trunk/psModules/src/objects/pmSourceIO.h

@@ -22 +22 @@
   bool pmSourcesWrite_##TYPE##_XRAD(psFits *fits, pmReadout *readout, psArray *sources, psMetadata *imageHeader, char *extname, psMetadata *recipe); \
   psArray *pmSourcesRead_##TYPE (psFits *fits, psMetadata *header); \
-  bool pmSourcesRead_##TYPE##_XSRC (psFits *fits, psMetadata *header, psArray *sources, long *index); \
-  bool pmSourcesRead_##TYPE##_XFIT (psFits *fits, psMetadata *header, psArray *sources, long *index); \
-  bool pmSourcesRead_##TYPE##_XRAD (psFits *fits, pmReadout *readout, psMetadata *header, psArray *sources, long *index);\
+  bool pmSourcesRead_##TYPE##_XSRC (psFits *fits, pmReadout *readout, psMetadata *header, psMetadata *tableHeader, psArray *sources, long *index); \
+  bool pmSourcesRead_##TYPE##_XFIT (psFits *fits, pmReadout *readout, psMetadata *header, psMetadata *tableHeader, psArray *sources, long *index); \
+  bool pmSourcesRead_##TYPE##_XRAD (psFits *fits, pmReadout *readout, psMetadata *header, psMetadata *tableHeader, psArray *sources, long *index);\
   
 // All of these functions need to use the same API, even if not all elements are used in a specific case