Changeset 36269

Timestamp:

Nov 8, 2013, 10:40:05 AM (13 years ago)

Author:

bills

Message:

handle some error conditions with regard to handling of EXT_MODEL_TYPE when reading an XFIT extension

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

@@ -1064 +1064 @@
         // 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
+        // but since we have many fewer XFIT rows than psf rows that is cheaper than putting it
         // in the psf table.
         psS32 extModelType = psMetadataLookupS32(&status, row, "EXT_MODEL_TYPE");
+        if (!status) {
+            // older cmfs don't have this column
+            extModelType = -1;
+        }
 
         psEllipseAxes axes;
@@ -1095 +1099 @@
         model->covar = covar;
 
-        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.
+            // This is important for programs like psastro (skycal) so that its output cmfs
+            // will have valid EXT_MODEL_TYPE
             psFree(source->modelEXT);
             source->modelEXT = psMemIncrRefCounter(model);
+            source->type = PM_SOURCE_TYPE_EXTENDED;
             if (0) {
-                // since FLAGS were read we shouldn't need to do this.
-                source->type = PM_SOURCE_TYPE_EXTENDED;
+                // since FLAGS were read we don't need to do this
                 source->mode |= PM_SOURCE_MODE_EXTMODEL;
-                source->mode |= PM_SOURCE_MODE_NONLINEAR_FIT;   // XXX: Is this safe?
+                source->mode |= PM_SOURCE_MODE_NONLINEAR_FIT;
             }
         }
 
+        psArrayAdd(source->modelFits, 1, model);
+        psFree(model);
         psFree(row);
     }