Changeset 25595

Timestamp:

Sep 27, 2009, 10:39:09 AM (17 years ago)

Author:

eugene

Message:

clean up some of the test code

File:

• branches/eam_branches/20090715/psModules/src/objects/pmSourceVisual.c (modified) (11 diffs)

branches/eam_branches/20090715/psModules/src/objects/pmSourceVisual.c

@@ -142 +142 @@
     psImageInit (resid, 0.0);
 
-    FILE *f = fopen ("stats.dat", "w");
-    for (int i = 0; i < sources->n; i++) {
+    // FILE *f = fopen ("stats.dat", "w");
+    // psAssert (f, "failed to open");
+
+    for (int i = sources->n - 1; i >= 0; i--) {
         pmSource *source = sources->data[i];
         if (!source) continue;
@@ -159 +161 @@
         int Yo = 0.1*srcModel->params->data.F32[PM_PAR_YPOS];
 
-        // insert source pixels in the image at 1/10th offset (XXX ignore centering for now)
-        // XXX calculate the pixel scatter values, chisq
+        // insert source pixels in the image at 1/10th offset
         for (int iy = 0; iy < source->pixels->numRows; iy++) {
             int jy = iy + Yo;
@@ -174 +175 @@
             }
         }
-
-        fprintf (f, "%d, %d -> %f  %f  %f  %f\n", Xo, Yo, norm, source->psfMag, source->apMag, -2.5*log10(source->moments->Sum));
-    }
-    fclose (f);
+        // fprintf (f, "%d, %d -> %f  %f  %f  %f\n", Xo, Yo, norm, source->psfMag, source->apMag, -2.5*log10(source->moments->Sum));
+    }
+    // fclose (f);
 
     // KapaClearSections (kapa2);
@@ -184 +184 @@
     pmVisualScaleImage (kapa2, resid, "resid", 2, true);
 
+# ifdef DEBUG
     { 
         psFits *fits = psFitsOpen ("image.fits", "w");
@@ -195 +196 @@
         psFitsClose (fits);
     }
+# endif
 
     psFree (image);
@@ -264 +266 @@
     if (!pmVisualIsVisual() || !plotPSF) return true;
 
-    // XXX skip for now
-    // return true;
-
     if (kapa1 == -1) {
         kapa1 = KapaOpenNamedSocket ("kapa", "pmSource:plots");
@@ -278 +277 @@
     KapaClearPlots (kapa1);
     KapaInitGraph (&graphdata);
-
-    // float min = +1e32;
-    // float max = -1e32;
-    // float Min = +1e32;
-    // float Max = -1e32;
 
     float Xmin = +1e32;
@@ -316 +310 @@
     xm->n = ym->n = Fm->n = n;
 
-    // psVector *xn = psVectorAlloc (x->n, PS_TYPE_F32);
-    // psVector *yn = psVectorAlloc (x->n, PS_TYPE_F32);
-    // psVector *zn = psVectorAlloc (x->n, PS_TYPE_F32);
-    // psVector *Zn = psVectorAlloc (x->n, PS_TYPE_F32);
-    // psVector *Fn = psVectorAlloc (x->n, PS_TYPE_F32);
-    // for (int i = 0; i < x->n; i++) {
-    //     xn->data.F32[i] = x->data.F32[i] / 5000.0;
-    //     yn->data.F32[i] = y->data.F32[i] / 5000.0;
-    //     zn->data.F32[i] = (resid->data.F32[i] - min) / (max - min);
-    //     Zn->data.F32[i] = (param->data.F32[i] - Min) / (Max - Min);
-    //     Fn->data.F32[i] = (model->data.F32[i] - Min) / (Max - Min);
-    // }
-
     // view 1 on resid
     section.dx = 1.0;
@@ -430 +411 @@
     KapaPlotVector (kapa1, y->n, model->data.F32, "y");
 
-# if (0)
-    // view 3 on resid
-    section.dx = 0.5;
-    section.dy = 0.33;
-    section.x = 0.0;
-    section.y = 0.33;
-    section.name = NULL;
-    psStringAppend (&section.name, "a3");
-    KapaSetSection (kapa1, &section);
-    psFree (section.name);
-    pmSourcePlotPoints3D (kapa1, &graphdata, xn, yn, Zn, 30.0*PS_RAD_DEG, -15.0*PS_RAD_DEG);
-
-    // view 4 on resid
-    section.dx = 0.5;
-    section.dy = 0.33;
-    section.x = 0.5;
-    section.y = 0.33;
-    section.name = NULL;
-    psStringAppend (&section.name, "a4");
-    KapaSetSection (kapa1, &section);
-    psFree (section.name);
-    pmSourcePlotPoints3D (kapa1, &graphdata, xn, yn, Zn, -60.0*PS_RAD_DEG, -15.0*PS_RAD_DEG);
-
-    // view 5 on resid
-    section.dx = 0.5;
-    section.dy = 0.33;
-    section.x = 0.0;
-    section.y = 0.66;
-    section.name = NULL;
-    psStringAppend (&section.name, "a5");
-    KapaSetSection (kapa1, &section);
-    psFree (section.name);
-    pmSourcePlotPoints3D (kapa1, &graphdata, xn, yn, Fn, 30.0*PS_RAD_DEG, -15.0*PS_RAD_DEG);
-
-    // view 6 on resid
-    section.dx = 0.5;
-    section.dy = 0.33;
-    section.x = 0.5;
-    section.y = 0.66;
-    section.name = NULL;
-    psStringAppend (&section.name, "a6");
-    KapaSetSection (kapa1, &section);
-    psFree (section.name);
-    pmSourcePlotPoints3D (kapa1, &graphdata, xn, yn, Fn, -60.0*PS_RAD_DEG, -15.0*PS_RAD_DEG);
-# endif
-
     psFree (resid);
     psFree (model);
@@ -486 +421 @@
 }
 
-// send in normalized points
+// Somewhat broken 3D plotting function (was used by pmSourceVisualPSFModelResid, but not anymore)
 bool pmSourcePlotPoints3D (int myKapa, Graphdata *graphdata, psVector *xn, psVector *yn, psVector *zn, float theta, float phi) {
 
@@ -521 +456 @@
     KapaSetLimits (myKapa, graphdata);
 
-    // KapaSetFont (myKapa, "helvetica", 14);
-    // KapaBox (myKapa, graphdata);
-    // KapaSendLabel (myKapa, "&ss&h_x| (pixels)", KAPA_LABEL_XM);
-    // KapaSendLabel (myKapa, "&ss&h_y| (pixels)", KAPA_LABEL_YM);
-
     graphdata->color = KapaColorByName ("black");
     graphdata->ptype = 100;