Changeset 36266 for branches/eam_branches/ipp-20130904/psModules/src/objects/pmSourceIO_CMF.c.in

Timestamp:

Nov 4, 2013, 3:29:19 PM (13 years ago)

Author:

bills

Message:

Set source->modelEXT to the model fit indicated by the EXT_MODEL_TYPE column so that
model is available when writing out the xfit extension. Otherwise we don't know what
to set EXT_MODEL_TYPE to in for example psastro

File:

• branches/eam_branches/ipp-20130904/psModules/src/objects/pmSourceIO_CMF.c.in (modified) (2 diffs)

branches/eam_branches/ipp-20130904/psModules/src/objects/pmSourceIO_CMF.c.in

@@ -1062 +1062 @@
         model->nDOF = psMetadataLookupF32(&status, row, "EXT_NDOF");
 
-        // XXX: We don't have place to put this. Needs to go in psf extension:
-        // psMetadataLookupS32(&status, row, "EXT_MODEL_TYPE");
+        // EXT_MODEL_TYPE gives the model chosen by psphot as the best.
+        // Putting this into the XFIT table makes 3 copies of it (one for each model)
+        // but since we have fewer XFIT rows than psf rows that is cheaper than putting it
+        // in the psf table.
+        psS32 extModelType = psMetadataLookupS32(&status, row, "EXT_MODEL_TYPE");
 
         psEllipseAxes axes;
@@ -1094 +1097 @@
         psArrayAdd(source->modelFits, 1, model);
         psFree(model);
+
+        if (modelType == extModelType) {
+            // The software that created this source picked this model as the best of the fits. 
+            // Set the extModel to point to it.
+            psFree(source->modelEXT);
+            source->modelEXT = psMemIncrRefCounter(model);
+            if (0) {
+                // since FLAGS were read we shouldn't need to do this.
+                source->type = PM_SOURCE_TYPE_EXTENDED;
+                source->mode |= PM_SOURCE_MODE_EXTMODEL;
+                source->mode |= PM_SOURCE_MODE_NONLINEAR_FIT;   // XXX: Is this safe?
+            }
+        }
 
         psFree(row);