Changeset 30707 for branches/eam_branches/ipp-20110213/psphot/src/psphotExtendedSourceFits.c

Timestamp:

Feb 19, 2011, 10:40:50 AM (15 years ago)

Author:

eugene

Message:

remove invalid references to isophot and kron from extended source analysis; use the measured sky stdev instead of the user guess; optionally allow stars as well as galaxies to get petrosians; fix target vs input seeing in psphotStack; allow radial apertures for single-image analysis as well as stack; calculate the radial aperture flux errors; calculate the petrosian parameter errors; turn on threads for ext source fits; save covar matrix for ext source fits; calculate petrosian fill factor

Location:

branches/eam_branches/ipp-20110213/psphot

Files:

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

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

@@ -178 +178 @@
             PS_ARRAY_ADD_SCALAR(job->args, 0, PS_TYPE_S32); // this is used as a return value for Nfain
 
-            if (false && !psThreadJobAddPending(job)) {
+// set this to 0 to run without threading
+# if (1)            
+            if (!psThreadJobAddPending(job)) {
                 psError(PS_ERR_UNKNOWN, false, "Unable to guess model.");
                 psFree(AnalysisRegion);
                 return false;
-            } else {
-                if (!psphotExtendedSourceFits_Threaded(job)) {
-                    psError(PS_ERR_UNKNOWN, false, "Unable to guess model.");
-                    psFree(AnalysisRegion);
-                    return false;
-                }
-                psScalar *scalar = NULL;
-                scalar = job->args->data[7];
-                Next += scalar->data.S32;
-                scalar = job->args->data[8];
-                Nconvolve += scalar->data.S32;
-                scalar = job->args->data[9];
-                NconvolvePass += scalar->data.S32;
-                scalar = job->args->data[10];
-                Nplain += scalar->data.S32;
-                scalar = job->args->data[11];
-                NplainPass += scalar->data.S32;
-                scalar = job->args->data[12];
-                Nfaint += scalar->data.S32;
-                psFree(job);
+            } 
+# else
+            if (!psphotExtendedSourceFits_Threaded(job)) {
+                psError(PS_ERR_UNKNOWN, false, "Unable to guess model.");
+                psFree(AnalysisRegion);
+                return false;
             }
-        }
+            psScalar *scalar = NULL;
+            scalar = job->args->data[7];
+            Next += scalar->data.S32;
+            scalar = job->args->data[8];
+            Nconvolve += scalar->data.S32;
+            scalar = job->args->data[9];
+            NconvolvePass += scalar->data.S32;
+            scalar = job->args->data[10];
+            Nplain += scalar->data.S32;
+            scalar = job->args->data[11];
+            NplainPass += scalar->data.S32;
+            scalar = job->args->data[12];
+            Nfaint += scalar->data.S32;
+            psFree(job);
+# endif
+        }
 
         // wait for the threads to finish and manage results
@@ -268 +271 @@
     psImageMaskType markVal = PS_SCALAR_VALUE(job->args->data[6],PS_TYPE_IMAGE_MASK_DATA);
 
+    pthread_t tid = pthread_self();     // Thread identifier
+
     // Define source fitting parameters for extended source fits
     pmSourceFitOptions *fitOptions = pmSourceFitOptionsAlloc();
     fitOptions->mode          = PM_SOURCE_FIT_EXT;
+    fitOptions->saveCovariance = true;  // XXX make this a user option?
+
     // XXX for now, use the defaults for the rest:
     // fitOptions->nIter         = fitIter;
@@ -296 +303 @@
         // XXX use the parameters guessed from moments
         // if (source->modelEXT == NULL) continue;
+
+        fprintf (stderr, "fit %d,%d in thread %d\n", source->peak->x, source->peak->y, (int) tid);
 
         // replace object in image