Changeset 34247 for branches/eam_branches/ipp-20120627/psphot/src/psphotExtendedSourceFits.c

Timestamp:

Jul 31, 2012, 11:50:18 AM (14 years ago)

Author:

eugene

Message:

merge changes from trunk

Location:

branches/eam_branches/ipp-20120627/psphot

Files:

• . (modified) (1 prop)
• src (modified) (1 prop)
• src/psphotExtendedSourceFits.c (modified) (7 diffs)

branches/eam_branches/ipp-20120627/psphot/src/psphotExtendedSourceFits.c

@@ -175 +175 @@
             psArrayAdd(job->args, 1, cells->data[j]); // sources
             psArrayAdd(job->args, 1, models);
+            // Allocate a metadata iterator here because psMetadataIteratorAlloc/Free are not thread safe
+            psMetadataIterator *iter = psMetadataIteratorAlloc (models, PS_LIST_HEAD, NULL);
+            psArrayAdd(job->args, 1, iter);
             psArrayAdd(job->args, 1, AnalysisRegion); // XXX make a pointer
 
@@ -203 +206 @@
             }
             psScalar *scalar = NULL;
-            scalar = job->args->data[7];
+            scalar = job->args->data[8];
             Next += scalar->data.S32;
-            scalar = job->args->data[8];
+            scalar = job->args->data[9];
             Nconvolve += scalar->data.S32;
-            scalar = job->args->data[9];
+            scalar = job->args->data[10];
             NconvolvePass += scalar->data.S32;
-            scalar = job->args->data[10];
+            scalar = job->args->data[11];
             Nplain += scalar->data.S32;
-            scalar = job->args->data[11];
+            scalar = job->args->data[12];
             NplainPass += scalar->data.S32;
-            scalar = job->args->data[12];
+            scalar = job->args->data[13];
             Nfaint += scalar->data.S32;
-            scalar = job->args->data[13];
+            scalar = job->args->data[14];
             Nfail += scalar->data.S32;
+            psFree(job->args->data[3]); // iterator allocated above
             psFree(job);
 # endif
@@ -235 +239 @@
             } else {
                 psScalar *scalar = NULL;
-                scalar = job->args->data[7];
+                scalar = job->args->data[8];
                 Next += scalar->data.S32;
-                scalar = job->args->data[8];
+                scalar = job->args->data[9];
                 Nconvolve += scalar->data.S32;
-                scalar = job->args->data[9];
+                scalar = job->args->data[10];
                 NconvolvePass += scalar->data.S32;
-                scalar = job->args->data[10];
+                scalar = job->args->data[11];
                 Nplain += scalar->data.S32;
-                scalar = job->args->data[11];
+                scalar = job->args->data[12];
                 NplainPass += scalar->data.S32;
-                scalar = job->args->data[12];
+                scalar = job->args->data[13];
                 Nfaint += scalar->data.S32;
-                scalar = job->args->data[13];
+                scalar = job->args->data[14];
                 Nfail += scalar->data.S32;
+                psFree(job->args->data[3]); // metadata iterator allocated above
             }
             psFree(job);
@@ -285 +290 @@
     psArray *sources        = job->args->data[1];
     psMetadata *models      = job->args->data[2];
-    psRegion *region        = job->args->data[3];
-    int psfSize             = PS_SCALAR_VALUE(job->args->data[4],S32);
-    psImageMaskType maskVal = PS_SCALAR_VALUE(job->args->data[5],PS_TYPE_IMAGE_MASK_DATA);
-    psImageMaskType markVal = PS_SCALAR_VALUE(job->args->data[6],PS_TYPE_IMAGE_MASK_DATA);
+    psMetadataIterator *iter = job->args->data[3];
+    psRegion *region        = job->args->data[4];
+    int psfSize             = PS_SCALAR_VALUE(job->args->data[5],S32);
+    psImageMaskType maskVal = PS_SCALAR_VALUE(job->args->data[6],PS_TYPE_IMAGE_MASK_DATA);
+    psImageMaskType markVal = PS_SCALAR_VALUE(job->args->data[7],PS_TYPE_IMAGE_MASK_DATA);
 
     // Define source fitting parameters for extended source fits
@@ -338 +344 @@
 
         // loop here over the models chosen for each source (exclude by S/N)
-        psMetadataIterator *iter = psMetadataIteratorAlloc (models, PS_LIST_HEAD, NULL);
+        // Reset the iterator
+        psMetadataIteratorSet(iter, PS_LIST_HEAD);
         psMetadataItem *item = NULL;
         while ((item = psMetadataGetAndIncrement (iter)) != NULL) {
@@ -428 +435 @@
           psFree (modelFit);
         }
-        psFree (iter);
 
         // evaluate the relative quality of the models, choose one
@@ -489 +495 @@
 
     // change the value of a scalar on the array (wrap this and put it in psArray.h)
-    scalar = job->args->data[7];
+    scalar = job->args->data[8];
     scalar->data.S32 = Next;
 
-    scalar = job->args->data[8];
+    scalar = job->args->data[9];
     scalar->data.S32 = Nconvolve;
 
-    scalar = job->args->data[9];
+    scalar = job->args->data[10];
     scalar->data.S32 = NconvolvePass;
 
-    scalar = job->args->data[10];
+    scalar = job->args->data[11];
     scalar->data.S32 = Nplain;
 
-    scalar = job->args->data[11];
+    scalar = job->args->data[12];
     scalar->data.S32 = NplainPass;
 
-    scalar = job->args->data[12];
+    scalar = job->args->data[13];
     scalar->data.S32 = Nfaint;
 
-    scalar = job->args->data[13];
+    scalar = job->args->data[14];
     scalar->data.S32 = Nfail;