Changeset 36412 for branches/bills_branches/bills_201312/psModules/src/objects/pmSourceIO_CFF.c

Timestamp:

Dec 26, 2013, 1:34:58 PM (13 years ago)

Author:

bills

Message:

add functions to save and read the model type values in XFIT headers

File:

• branches/bills_branches/bills_201312/psModules/src/objects/pmSourceIO_CFF.c (modified) (4 diffs)

branches/bills_branches/bills_201312/psModules/src/objects/pmSourceIO_CFF.c

@@ -65 +65 @@
     int modelType = pmModelClassGetType ("PS_MODEL_GAUSS");
 
+    // Read lookup table for model classes (if defined)
+    pmModelClassReadHeader(header);
+
     char *PSF_NAME = psMetadataLookupStr (&status, header, "PSFMODEL");
     if (PSF_NAME != NULL) {
@@ -111 +114 @@
         float theta      = psMetadataLookupF32 (&status, row, "THETA");
 
-        // XXX: we need to put a lookup table in the cff header to define the correspondence of the
-        // model type values in the cff with our models. (We want to use an interger for efficiency
-        // but the value for each model type is set on the organization of the the array in pmModelClass.c
-        // For now use the input values verbatim and trust the user that this is valid value
         int   galaxyModelType = psMetadataLookupS32(&status, row, "MODEL_TYPE");
+        if (status) {
+            galaxyModelType = pmModelClassGetLocalType(galaxyModelType);
+        } else {
+            galaxyModelType = -1;
+        }
         float Sindex     = psMetadataLookupF32 (&status, row, "INDEX"); // Should this be PAR_07 not sersic index
 
@@ -181 +185 @@
         }
 
-        // XXX: should use < 0 as invalid galaxyModelType
-
-        if (fitGalaxy && galaxyModelType > 0) {
+        if (fitGalaxy && galaxyModelType >= 0) {
             source->modelFits = psArrayAllocEmpty (1);
             pmModel *model = pmModelAlloc(galaxyModelType);
@@ -235 +237 @@
     psF32 exptime = psMetadataLookupF32(&mdok, readout->parent->concepts, "CELL.EXPOSURE");
     PS_ASSERT(mdok, false);
+
+    // write the definition of the model class type values to the header
+    pmModelClassWriteHeader(header);
 
     psArray *table = psArrayAllocEmpty(sources->n);