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

Timestamp:

May 21, 2014, 9:37:09 AM (12 years ago)

Author:

bills

Message:

Changes to full force galaxy shapes analysis

• Put parameters for all extended models into cff file
• in psphotFullForce select models to force and those to skip
• skip sources that are very likely to be stars
• clean up a few "hacky" pieces of the implementation

File:

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

trunk/psModules/src/objects/pmSourceIO.c

@@ -1202 +1202 @@
         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 +1250 @@
         }
 
-        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 +1256 @@
         psFree (dataname);
         psFree (tableHeader);
+        }
         break;