Changeset 35844

Timestamp:

Jul 18, 2013, 2:20:25 PM (13 years ago)

Author:

eugene

Message:

set psphot options for DIFF imaging with the new conv criteria; count deblended satstars

Location:

branches/eam_branches/ipp-20130711/psphot/src

Files:

• psphotDeblendSatstars.c (modified) (3 diffs)
• psphotExtendedSourceFits.c (modified) (2 diffs)

branches/eam_branches/ipp-20130711/psphot/src/psphotDeblendSatstars.c

@@ -128 +128 @@
     // int display = psphotKapaChannel (1);
     // psphotVisualScaleImage (display, (psImage *) source->pixels->parent, NULL, "image", 1.0, 0);
+
+    int Nsatstar = 0;
 
     // examine sources in decreasing SN order
@@ -179 +181 @@
         source->mode2 |= PM_SOURCE_MODE2_SATSTAR_PROFILE; // and we have in fact subtracted the profile
 
+        Nsatstar ++;
+
         // XXX visualize, model, and subtract
         // if (!psphotVisualRadialProfileSatstar (source, maskVal)) {
@@ -192 +196 @@
     psFree (index);
 
-    psLogMsg ("psphot", PS_LOG_INFO, "deblend satstar: %f sec\n", psTimerMark ("psphot.deblend.sat"));
+    psLogMsg ("psphot", PS_LOG_INFO, "deblend %d satstars: %f sec\n", Nsatstar, psTimerMark ("psphot.deblend.sat"));
     return true;
 }

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

@@ -521 +521 @@
                   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) {
@@ -544 +548 @@
                       float Ymax = PAR[PM_PAR_YPOS] + 0.5*PAR[PM_PAR_LENGTH]*cos(PAR[PM_PAR_THETA]);
 
-                      if (false && (source->peak->xf > 1100) && 
-                          (source->peak->xf < 1400) && 
-                          (source->peak->yf < 245)) {
+                      if ((fabs(source->peak->xf - 2572) < 20) && (fabs(source->peak->yf - 5874) < 20)) {
                           fprintf (stderr, "src vs fit : %d %d - %d %d | %f %f - %f %f\n", 
                                    source->pixels->col0, source->pixels->row0,