Changeset 37403 for branches/eam_branches/ps2-tc3-20130727/psModules/src/objects/pmSourceIO.c

Timestamp:

Sep 19, 2014, 4:05:27 PM (12 years ago)

Author:

eugene

Message:

merge changes from trunk

Location:

branches/eam_branches/ps2-tc3-20130727

Files:

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

branches/eam_branches/ps2-tc3-20130727/psModules/src/objects

@@ -15 +15 @@
 pmSourceIO_CMF_PS1_SV1.c
 pmSourceIO_CMF_PS1_SV2.c
+pmSourceIO_CMF_PS1_SV3.c
+pmSourceIO_CMF_PS1_SV4.c
 pmSourceIO_CMF_PS1_DV1.c
 pmSourceIO_CMF_PS1_DV2.c
 pmSourceIO_CMF_PS1_DV3.c
+pmSourceIO_CMF_PS1_DV4.c
 

@@ -15 +15 @@
 pmSourceIO_CMF_PS1_SV1.c
 pmSourceIO_CMF_PS1_SV2.c
+pmSourceIO_CMF_PS1_SV3.c
+pmSourceIO_CMF_PS1_SV4.c
 pmSourceIO_CMF_PS1_DV1.c
 pmSourceIO_CMF_PS1_DV2.c
 pmSourceIO_CMF_PS1_DV3.c
+pmSourceIO_CMF_PS1_DV4.c
 

branches/eam_branches/ps2-tc3-20130727/psModules/src/objects/pmSourceIO.c

@@ -40 +40 @@
 #include "pmMoments.h"
 #include "pmModelFuncs.h"
+#include "pmModelClass.h"
 #include "pmModel.h"
 #include "pmModelUtils.h"
-#include "pmModelClass.h"
 #include "pmSourceMasks.h"
 #include "pmSourceExtendedPars.h"
@@ -365 +365 @@
 # define PM_SOURCES_WRITE(NAME,TYPE)                                    \
     if (!strcmp (exttype, NAME)) {                                      \
-        status &= pmSourcesWrite_##TYPE(file->fits, readout, sources, file->header, outhead, dataname, recipe); \
+        status = pmSourcesWrite_##TYPE(file->fits, readout, sources, file->header, outhead, dataname, recipe); \
         if (xsrcname) {                                                 \
             status &= pmSourcesWrite_##TYPE##_XSRC(file->fits, readout, sources, file->header, xsrcname, recipe); \
@@ -589 +589 @@
 
             // these are case-sensitive since the EXTYPE is case-sensitive
-            status = true;
+            status = false;
             PM_SOURCES_WRITE("SMPDATA",   SMPDATA);
             PM_SOURCES_WRITE("PS1_DEV_0", PS1_DEV_0);
@@ -601 +601 @@
             PM_SOURCES_WRITE("PS1_SV1",   CMF_PS1_SV1);
             PM_SOURCES_WRITE("PS1_SV2",   CMF_PS1_SV2);
+            PM_SOURCES_WRITE("PS1_SV3",   CMF_PS1_SV3);
+            PM_SOURCES_WRITE("PS1_SV4",   CMF_PS1_SV4);
             PM_SOURCES_WRITE("PS1_DV1",   CMF_PS1_DV1);
             PM_SOURCES_WRITE("PS1_DV2",   CMF_PS1_DV2);
             PM_SOURCES_WRITE("PS1_DV3",   CMF_PS1_DV3);
+            PM_SOURCES_WRITE("PS1_DV4",   CMF_PS1_DV4);
 
             psFree (outhead);
@@ -1121 +1124 @@
             PM_SOURCES_READ_PSF("PS1_SV1",   CMF_PS1_SV1);
             PM_SOURCES_READ_PSF("PS1_SV2",   CMF_PS1_SV2);
+            PM_SOURCES_READ_PSF("PS1_SV3",   CMF_PS1_SV3);
+            PM_SOURCES_READ_PSF("PS1_SV4",   CMF_PS1_SV4);
             PM_SOURCES_READ_PSF("PS1_DV1",   CMF_PS1_DV1);
             PM_SOURCES_READ_PSF("PS1_DV2",   CMF_PS1_DV2);
             PM_SOURCES_READ_PSF("PS1_DV3",   CMF_PS1_DV3);
+            PM_SOURCES_READ_PSF("PS1_DV4",   CMF_PS1_DV4);
+
+            if (!sources) {
+                psError(PS_ERR_IO, false, "reading CMF data from %s with format %s\n", file->filename, exttype);
+                return false;
+            }
 
             long *sourceIndex = NULL;
@@ -1202 +1213 @@
         break;
 
-      case PM_FPA_FILE_CFF:
+      case PM_FPA_FILE_CFF: {
+        // determine the output table format
+        psMetadata *recipe = psMetadataLookupMetadata(&status, config->recipes, "PSPHOT");
+        if (!status) {
+            psError(PS_ERR_UNKNOWN, true, "missing recipe PSPHOT in config data");
+            return false;
+        }
         // read in header, if not yet loaded
         hdu = pmFPAviewThisHDU (view, file->fpa);
@@ -1244 +1261 @@
         }
 
-        sources = pmSourcesRead_CFF(file->fits, hdu->header);
+        sources = pmSourcesRead_CFF(file->fits, hdu->header, recipe);
 
         psTrace("psModules.objects", 6, "read CMF table from %s : %s : %s", file->filename, headname, dataname);
@@ -1250 +1267 @@
         psFree (dataname);
         psFree (tableHeader);
+        }
         break;
 
@@ -1395 +1413 @@
         PM_SOURCES_READ_XSRC("PS1_SV1",   CMF_PS1_SV1);
         PM_SOURCES_READ_XSRC("PS1_SV2",   CMF_PS1_SV2);
+        PM_SOURCES_READ_XSRC("PS1_SV3",   CMF_PS1_SV3);
+        PM_SOURCES_READ_XSRC("PS1_SV4",   CMF_PS1_SV4);
         PM_SOURCES_READ_XSRC("PS1_DV1",   CMF_PS1_DV1);
         PM_SOURCES_READ_XSRC("PS1_DV2",   CMF_PS1_DV2);
         PM_SOURCES_READ_XSRC("PS1_DV3",   CMF_PS1_DV3);
+        PM_SOURCES_READ_XSRC("PS1_DV4",   CMF_PS1_DV4);
     }
     psFree(tableHeader);
@@ -1435 +1456 @@
         PM_SOURCES_READ_XFIT("PS1_SV1",   CMF_PS1_SV1);
         PM_SOURCES_READ_XFIT("PS1_SV2",   CMF_PS1_SV2);
+        PM_SOURCES_READ_XFIT("PS1_SV3",   CMF_PS1_SV3);
+        PM_SOURCES_READ_XFIT("PS1_SV4",   CMF_PS1_SV4);
         PM_SOURCES_READ_XFIT("PS1_DV1",   CMF_PS1_DV1);
         PM_SOURCES_READ_XFIT("PS1_DV2",   CMF_PS1_DV2);
         PM_SOURCES_READ_XFIT("PS1_DV3",   CMF_PS1_DV3);
+        PM_SOURCES_READ_XFIT("PS1_DV4",   CMF_PS1_DV4);
     }
     psFree(tableHeader);
@@ -1474 +1498 @@
         PM_SOURCES_READ_XRAD("PS1_SV1",   CMF_PS1_SV1);
         PM_SOURCES_READ_XRAD("PS1_SV2",   CMF_PS1_SV2);
+        PM_SOURCES_READ_XRAD("PS1_SV3",   CMF_PS1_SV3);
+        PM_SOURCES_READ_XRAD("PS1_SV4",   CMF_PS1_SV4);
         PM_SOURCES_READ_XRAD("PS1_DV1",   CMF_PS1_DV1);
         PM_SOURCES_READ_XRAD("PS1_DV2",   CMF_PS1_DV2);
         PM_SOURCES_READ_XRAD("PS1_DV3",   CMF_PS1_DV3);
+        PM_SOURCES_READ_XRAD("PS1_DV4",   CMF_PS1_DV4);
     }
     psFree(tableHeader);
@@ -1513 +1540 @@
         PM_SOURCES_READ_XGAL("PS1_SV1",   CMF_PS1_SV1);
         PM_SOURCES_READ_XGAL("PS1_SV2",   CMF_PS1_SV2);
+        PM_SOURCES_READ_XGAL("PS1_SV3",   CMF_PS1_SV3);
+        PM_SOURCES_READ_XGAL("PS1_SV4",   CMF_PS1_SV4);
         PM_SOURCES_READ_XGAL("PS1_DV1",   CMF_PS1_DV1);
         PM_SOURCES_READ_XGAL("PS1_DV2",   CMF_PS1_DV2);
         PM_SOURCES_READ_XGAL("PS1_DV3",   CMF_PS1_DV3);
+        PM_SOURCES_READ_XGAL("PS1_DV4",   CMF_PS1_DV4);
     }
     psFree(tableHeader);

@@ -15 +15 @@
 pmSourceIO_CMF_PS1_SV1.c
 pmSourceIO_CMF_PS1_SV2.c
+pmSourceIO_CMF_PS1_SV3.c
+pmSourceIO_CMF_PS1_SV4.c
 pmSourceIO_CMF_PS1_DV1.c
 pmSourceIO_CMF_PS1_DV2.c
 pmSourceIO_CMF_PS1_DV3.c
+pmSourceIO_CMF_PS1_DV4.c