Changeset 36108 for trunk/psphot/src

Timestamp:

Sep 11, 2013, 11:00:36 AM (13 years ago)

Author:

eugene

Message:

make sure extendend source fits are threaded; do not trigger test object

File:

• trunk/psphot/src/psphotExtendedSourceFits.c (modified) (3 diffs)

trunk/psphot/src/psphotExtendedSourceFits.c

@@ -475 +475 @@
         }
 
+        bool testObject = false;
+        // testObject |= ((fabs(source->peak->xf -  179) < 5) && (fabs(source->peak->yf - 1138) < 5));
+        // testObject |= ((fabs(source->peak->xf - 5047) < 5) && (fabs(source->peak->yf -  151) < 5));
+        // testObject |= ((fabs(source->peak->xf - 3929) < 5) && (fabs(source->peak->yf - 4109) < 5));
+        // testObject |= ((fabs(source->peak->xf -  915) < 5) && (fabs(source->peak->yf - 5998) < 5));
+        // testObject |= ((fabs(source->peak->xf - 5406) < 5) && (fabs(source->peak->yf -  326) < 5));
+        if (testObject) {
+            fprintf (stderr, "test object @ %f, %f\n", source->peak->xf, source->peak->yf);
+            psTraceSetLevel ("psModules.objects.pmPCM_MinimizeChisq", 5);
+            psTraceSetLevel ("psphot.psphotExtendedSourceFits_Threaded", 5);
+        }
+
         // loop here over the models chosen for each source (exclude by S/N)
         // Reset the iterator
@@ -531 +543 @@
                   psFree (source->modelFlux);
                   source->modelFlux = NULL;
-                  // if ((fabs(source->peak->xf - 2572) < 20) && (fabs(source->peak->yf - 5874) < 20)) {
-                  //   fprintf (stderr, "test object\n");
-                  // }
-
                   modelFit = psphotFitEXT (modelFit, readout, source, fitOptions, modelType, maskVal, markVal);
                   if (!modelFit) {
@@ -646 +654 @@
         psTrace ("psphot", 4, "best ext model for %f, %f : %s chisq = %f\n", source->moments->Mx, source->moments->My, pmModelClassGetName (source->modelEXT->type), source->modelEXT->chisq);
         psTrace ("psphot", 5, "extended source model for source at %7.1f, %7.1f", source->moments->Mx, source->moments->My);
+
+        if (testObject) {
+            psTraceSetLevel ("psModules.objects.pmPCM_MinimizeChisq", 0);
+            psTraceSetLevel ("psphot.psphotExtendedSourceFits_Threaded", 0);
+        }
     }