Changeset 36758 for trunk/psModules

Timestamp:

May 21, 2014, 12:46:16 PM (12 years ago)

Author:

bills

Message:

handle case where a model exists but the galaxy shapes measurement was not performed

File:

• trunk/psModules/src/objects/pmSourceIO_CMF.c.in (modified) (1 diff)

trunk/psModules/src/objects/pmSourceIO_CMF.c.in

@@ -1475 +1475 @@
         for (int iModel = 0; iModel < source->modelFits->n; iModel++) {
             pmModel *model = source->modelFits->data[iModel];
-            pmSourceGalaxyFits *galaxyFits = source->galaxyFits->data[iModel];
-
-            if (!model || !galaxyFits) return false;
-
-            // XXX: TODO: we should search for the model that has the same type as the fits
-            psAssert(model->type == galaxyFits->modelType, "galaxyFits model type does not match model type");
+            if (!model) continue;
+
+            pmSourceGalaxyFits *galaxyFits = NULL;
+            for (int iFit = 0; iFit < source->galaxyFits->n; iFit++) {
+                galaxyFits = source->galaxyFits->data[iFit];
+                if (model->type == galaxyFits->modelType) break;
+                galaxyFits = NULL;
+            }
+
+            if (!galaxyFits) continue;
 
             // X,Y coordinates are stored with the model parameters