Changeset 36759 for trunk/psphot/src

Timestamp:

May 21, 2014, 2:10:14 PM (12 years ago)

Author:

bills

Message:

changes to psphotFullForceSummary to deal with multiple models per source

File:

• trunk/psphot/src/psphotFullForceSummaryReadout.c (modified) (2 diffs)

trunk/psphot/src/psphotFullForceSummaryReadout.c

@@ -188 +188 @@
     int ID = source0->seq;
 
-    // Find the parameters from the cff tables
+    // Find the parameters from the cff tables. nModels is the number of extended model types that
+    // this source has an entry for
     int nModels = 0;
     // skip table 0 which is modelType -1 not extended
@@ -227 +228 @@
             }
         }
-        if (nModels && !outSrc->modelFits && source->modelFits && source->modelFits->n == nModels) {
-            outSrc->modelFits =  psMemIncrRefCounter(source->modelFits);
+        if (nModels && source->modelFits && source->modelFits->n) {
+            if (!outSrc->modelFits) {
+                outSrc->modelFits = psArrayAllocEmpty(nModels);
+            }
+            for (int iModel = 0; iModel < source->modelFits->n; iModel++) {
+                pmModel *newModel = source->modelFits->data[iModel];
+                pmModel *outModel = NULL;
+                for (int jModel = 0; jModel < outSrc->modelFits->n; jModel++) {
+                    outModel = outSrc->modelFits->data[jModel];
+                    if (newModel->type == outModel->type)  {
+                        // already have an entry for this type
+                        break;
+                    }
+                    outModel = NULL;
+                }
+                if (!outModel) {
+                    // no model of this type in output source yet. Add this one.
+                    // Note: the parameters that we need (position, angle, index, if applicable)
+                    // are the same for all sources so copying any of them is fine
+                    psArrayAdd(outSrc->modelFits, 1, newModel);
+                }
+            }
         }
     }