Changeset 32617 for branches/eam_branches/ipp-20110906/psModules

Timestamp:

Nov 5, 2011, 2:32:03 PM (15 years ago)

Author:

eugene

Message:

introduce PS1_V4 format (adds sky limit info)

Location:

branches/eam_branches/ipp-20110906/psModules/src/objects

Files:

• Makefile.am (modified) (1 diff)
• pmSource.c (modified) (1 diff)
• pmSourceIO.c (modified) (2 diffs)
• pmSourceIO.h (modified) (2 diffs)

branches/eam_branches/ipp-20110906/psModules/src/objects/Makefile.am

@@ -45 +45 @@
         pmSourceIO_CMF_PS1_V2.c \
         pmSourceIO_CMF_PS1_V3.c \
+        pmSourceIO_CMF_PS1_V4.c \
         pmSourceIO_CMF_PS1_SV1.c \
         pmSourceIO_CMF_PS1_DV1.c \

branches/eam_branches/ipp-20110906/psModules/src/objects/pmSource.c

@@ -137 +137 @@
     source->apFlux           = NAN;
     source->apFluxErr        = NAN; 
+
+    source->skyRadius        = NAN;
+    source->skyFlux          = NAN;
+    source->skySlope         = NAN;
 
     source->pixWeightNotBad  = NAN;

branches/eam_branches/ipp-20110906/psModules/src/objects/pmSourceIO.c

@@ -569 +569 @@
             PM_SOURCES_WRITE("PS1_V2",    CMF_PS1_V2);
             PM_SOURCES_WRITE("PS1_V3",    CMF_PS1_V3);
+            PM_SOURCES_WRITE("PS1_V4",    CMF_PS1_V4);
             PM_SOURCES_WRITE("PS1_SV1",   CMF_PS1_SV1);
             PM_SOURCES_WRITE("PS1_DV1",   CMF_PS1_DV1);
@@ -1025 +1026 @@
                 sources = pmSourcesRead_CMF_PS1_V3 (file->fits, hdu->header);
             }
+            if (!strcmp (exttype, "PS1_V4")) {
+                sources = pmSourcesRead_CMF_PS1_V4 (file->fits, hdu->header);
+            }
             if (!strcmp (exttype, "PS1_SV1")) {
                 sources = pmSourcesRead_CMF_PS1_SV1 (file->fits, hdu->header);

branches/eam_branches/ipp-20110906/psModules/src/objects/pmSourceIO.h

@@ -62 +62 @@
 bool pmSourcesWrite_CMF_PS1_V3_XRAD(psFits *fits, pmReadout *readout, psArray *sources, psMetadata *imageHeader, char *extname, psMetadata *recipe);
 
+bool pmSourcesWrite_CMF_PS1_V4(psFits *fits, pmReadout *readout, psArray *sources, psMetadata *imageHeader, psMetadata *tableHeader, char *extname, psMetadata *recipe);
+bool pmSourcesWrite_CMF_PS1_V4_XSRC(psFits *fits, pmReadout *readout, psArray *sources, psMetadata *imageHeader, char *extname, psMetadata *recipe);
+bool pmSourcesWrite_CMF_PS1_V4_XFIT(psFits *fits, pmReadout *readout, psArray *sources, psMetadata *imageHeader, char *extname);
+bool pmSourcesWrite_CMF_PS1_V4_XRAD(psFits *fits, pmReadout *readout, psArray *sources, psMetadata *imageHeader, char *extname, psMetadata *recipe);
+
 bool pmSourcesWrite_CMF_PS1_SV1(psFits *fits, pmReadout *readout, psArray *sources, psMetadata *imageHeader, psMetadata *tableHeader, char *extname, psMetadata *recipe);
 bool pmSourcesWrite_CMF_PS1_SV1_XSRC(psFits *fits, pmReadout *readout, psArray *sources, psMetadata *imageHeader, char *extname, psMetadata *recipe);
@@ -86 +91 @@
 psArray *pmSourcesRead_CMF_PS1_V2 (psFits *fits, psMetadata *header);
 psArray *pmSourcesRead_CMF_PS1_V3 (psFits *fits, psMetadata *header);
+psArray *pmSourcesRead_CMF_PS1_V4 (psFits *fits, psMetadata *header);
 psArray *pmSourcesRead_CMF_PS1_SV1 (psFits *fits, psMetadata *header);
 psArray *pmSourcesRead_CMF_PS1_DV1 (psFits *fits, psMetadata *header);