Changeset 9734 for trunk/psphot/src/psphotFitSet.c

Timestamp:

Oct 24, 2006, 2:07:03 PM (20 years ago)

Author:

Paul Price

Message:

Changed definition of psVectorAlloc and psArrayAlloc

File:

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

trunk/psphot/src/psphotFitSet.c

@@ -8 +8 @@
     if (f == NULL) return false;
 
-    psArray *modelSet = psArrayAlloc (16);
-    // DROP modelSet->n = 0;
+    psArray *modelSet = psArrayAllocEmpty (16);
 
     while (fscanf (f, "%lf %lf %lf", &x, &y, &Io) == 3) {
-        pmModel *model = pmModelAlloc (oneModel->type);
-        
-        for (psS32 i = 0; i < model->params->n; i++) {
-            model->params->data.F32[i] = oneModel->params->data.F32[i];
-            model->dparams->data.F32[i] = oneModel->dparams->data.F32[i];
-        }
-        model->params->data.F32[1] = Io;
-        model->params->data.F32[2] = x;
-        model->params->data.F32[3] = y;
-        psArrayAdd (modelSet, 16, model);
+        pmModel *model = pmModelAlloc (oneModel->type);
+
+        for (psS32 i = 0; i < model->params->n; i++) {
+            model->params->data.F32[i] = oneModel->params->data.F32[i];
+            model->dparams->data.F32[i] = oneModel->dparams->data.F32[i];
+        }
+        model->params->data.F32[1] = Io;
+        model->params->data.F32[2] = x;
+        model->params->data.F32[3] = y;
+        psArrayAdd (modelSet, 16, model);
     }
 
@@ -31 +30 @@
     // subtract object, leave local sky
     for (int i = 0; i < modelSet->n; i++) {
-        pmModel *model = modelSet->data[i];
-        pmModelSub (source->pixels, source->mask, model, false, false);
-    
-        fprintf (stderr, "output parameters (obj %d):\n", i);
-        for (int n = 0; n < model->params->n; n++) {
-            fprintf (stderr, "%d : %f\n", n, model->params->data.F32[n]);
-        }
+        pmModel *model = modelSet->data[i];
+        pmModelSub (source->pixels, source->mask, model, false, false);
+
+        fprintf (stderr, "output parameters (obj %d):\n", i);
+        for (int n = 0; n < model->params->n; n++) {
+            fprintf (stderr, "%d : %f\n", n, model->params->data.F32[n]);
+        }
     }
 
-    // write out 
+    // write out
     psphotSaveImage (NULL, source->pixels, "resid.fits");
     psphotSaveImage (NULL, source->mask, "mask.fits");