Changeset 35604

Timestamp:

May 29, 2013, 9:03:05 AM (13 years ago)

Author:

eugene

Message:

fix / cleanup some of the relphot plotting functions (Mmos plots failed in threaded context); force use of INNER_WTMEAN for Mmos

Location:

branches/eam_branches/ipp-20130509/Ohana/src

Files:

• libkapa/src/IOfuncs.c (modified) (6 diffs)
• relphot/include/relphot.h (modified) (1 diff)
• relphot/src/ImageOps.c (modified) (3 diffs)
• relphot/src/MosaicOps.c (modified) (5 diffs)
• relphot/src/plotstuff.c (modified) (2 diffs)

branches/eam_branches/ipp-20130509/Ohana/src/libkapa/src/IOfuncs.c

@@ -30 +30 @@
   sscanf (buffer, "%*s %d", &Nbytes);
   ALLOCATE (data, char, Nbytes + 1);
+  memset (data, 0, Nbytes + 1);
+
   status = read (device, data, Nbytes);
   if (status != Nbytes) {
@@ -78 +80 @@
       // XXX BUT: I need to think a bit more about hand-shaking.
   }
-  if (DEBUG) fprintf (stderr, "recv buffer: %s\n", buffer);
+  if (DEBUG) fprintf (stderr, "recv buffer: %s...\n", buffer);
 
   /* find the message length, allocate space */
   sscanf (buffer, "%*s %d", &Nbytes);
   ALLOCATE (message, char, Nbytes + 1);
+  memset (message, 0, Nbytes + 1);
 
   /* read Nbytes from the device */
@@ -92 +95 @@
   /* make the string easy to parse */
 
-  if (DEBUG) fprintf (stderr, "recv: %s\n", message);
+  if (DEBUG) fprintf (stderr, "recv: %s...\n", message);
 
   /* scan the incoming message */
@@ -131 +134 @@
   if (Nwrite != length) return (FALSE);
 
-  if (DEBUG) fprintf (stderr, "send: %s\n", string);
+  if (DEBUG) fprintf (stderr, "send: %s...\n", string);
 
   free (string);
@@ -145 +148 @@
 
   ALLOCATE (message, char, length + 1);
+  memset (message, 0, length + 1);
 
   /* read Nbytes from the device */
   status = read (device, message, length);
-  if (DEBUG) fprintf (stderr, "recv message: %s\n", message);
+  if (DEBUG) fprintf (stderr, "recv message: %s...\n", message);
 
   if (status != length) {
@@ -173 +177 @@
   Nbytes = strlen (expect);
   ALLOCATE (answer, char, Nbytes + 1);
+  memset (answer, 0, Nbytes + 1);
 
   KiiScanCommand (device, Nbytes, "%s", answer);

branches/eam_branches/ipp-20130509/Ohana/src/relphot/include/relphot.h

@@ -328 +328 @@
 void          plot_star_coords    PROTO((Catalog *catalog, int Ncatalog));
 void          plot_stars          PROTO((Catalog *catalog, int Ncatalog));
+
+void          plot_list_add       PROTO((Graphdata *graphdata, double *xlist, double *ylist, int N));
+int           get_graph           PROTO((int N));
+int           open_graph          PROTO((int N));
+
 void          reload_catalogs     PROTO((SkyList *skylist, FlatCorrectionTable *flatcorr, int hostID, char *hostpath));
 int           reload_catalogs_parallel PROTO((SkyList *sky));

branches/eam_branches/ipp-20130509/Ohana/src/relphot/src/ImageOps.c

@@ -595 +595 @@
     image[i].Xm    = 100.0*log10(stats.chisq);
 
-    plot_setMcal (list, N, &stats, CLOUD_TOLERANCE);
+    if (PLOTSTUFF) {
+      fprintf (stderr, "Mcal for : %s\n", image[i].name);
+      plot_setMcal (list, N, &stats, CLOUD_TOLERANCE);
+    }
 
     // bright end scatter
@@ -683 +686 @@
 }
 
+static int setMcal_init_done = FALSE;
 void plot_setMcal (double *list, int Npts, StatType *stats, float clouds) {
 
@@ -692 +696 @@
 
   if (Npts == 0) {
-    fprintf (stderr, "cannot set image Mcal values yet (nan Mave)\n");
+    // fprintf (stderr, "cannot set image Mcal values yet (nan Mave)\n");
     return;
   }
 
+  plot_defaults (&graphdata);
+  graphdata.xmin = -0.01;
+  graphdata.xmax = +1.01;
+  graphdata.ymin = -0.21;
+  graphdata.ymax = +0.21;
+
+  if (!setMcal_init_done) {
+    int kapa = get_graph(0);
+    if (kapa < 1) {
+      kapa = open_graph(0);
+      if (!kapa) return;
+    }
+
+    KapaClearSections (kapa);
+    KapaClearPlots (kapa);
+    KapaSetLimits (kapa, &graphdata);
+    KapaSetFont (kapa, "helvetica", 14);
+    KapaBox (kapa, &graphdata);
+    setMcal_init_done = TRUE;
+  }
+
   ALLOCATE (xlist, double, Npts);
-
-  /**** Mcal vs seq ****/
-  float minMcal    = +100.0;
-  float maxMcal    = -100.0;
   for (i = 0; i < Npts; i++) {
-    xlist[i] = i;
-    minMcal = MIN (list[i], minMcal);
-    maxMcal = MAX (list[i], maxMcal);
-  }
-
-  float McalRange  = MAX(1.2*(maxMcal - minMcal), 0.21);
-  float McalCenter = 0.5*(maxMcal + minMcal);
-
-  plot_defaults (&graphdata);
-  graphdata.xmin = -1;
-  graphdata.xmax = Npts + 1;
-  graphdata.ymin = McalCenter - 0.5*McalRange;
-  graphdata.ymax = McalCenter + 0.5*McalRange;
-  plot_list (&graphdata, xlist, list, Npts, "sequence vs Mcal", "%s.seq.png", OUTROOT);
+    xlist[i] = i / (float) Npts;
+  }
+
+  plot_list_add (&graphdata, xlist, list, Npts);
 
   free (xlist);

branches/eam_branches/ipp-20130509/Ohana/src/relphot/src/MosaicOps.c

@@ -711 +711 @@
   if (FREEZE_MOSAICS) return (FALSE);
 
-  if (NTHREADS) {
+  // plots cannot be done in a threaded context (the plot commands collide)
+  // so do not run setMmos in threaded mode if PLOTSTUFF is set
+  if (NTHREADS && !PLOTSTUFF) {
     int status = setMmos_threaded (catalog, PoorImages, flatcorr);
     return status;
@@ -734 +736 @@
   SetMmosInfoInit (&info, Nmax, TRUE, PoorImages);
 
+  // int savePlotDelay = PLOTDELAY;
+  // if (PLOTSTUFF) PLOTDELAY = 0.0;
+
   for (i = 0; i < Nmosaic; i++) {
     setMmos_mosaic (&mosaic[i], i, image, catalog, &info, flatcorr);
   }
   SetMmosInfoFree (&info);
+
+  if (PLOTSTUFF) {
+    fprintf (stdout, "press return\n"); 
+    if (fscanf (stdin, "%*c") != 1) fprintf (stderr, "\n");
+  }
 
   npass_output ++;
@@ -757 +767 @@
 
   StatType stats;
-  liststats_setmode (&stats, STATMODE);
+  // liststats_setmode (&stats, STATMODE);
+  liststats_setmode (&stats, "INNER_WTMEAN");
 
   double *list   = info->list;
@@ -937 +948 @@
   }
 
-  plot_setMcal (list, N, &stats, CLOUD_TOLERANCE);
+  if (PLOTSTUFF) {
+    fprintf (stderr, "Mmos: %6.3f %6.3f +/- %6.3f %5d %5d | %s\n", stats.mean, stats.median, stats.sigma, stats.Nmeas, N, image[MosaicToImage[Nmos][0]].name);
+    plot_setMcal (list, N, &stats, CLOUD_TOLERANCE);
+  }
 
   // bright end scatter
@@ -961 +975 @@
     // fprintf (stderr, "%d %d %d\n", (int) i, (int) im, image[im].ubercalDist);
   }
+  
   return TRUE;
 }

branches/eam_branches/ipp-20130509/Ohana/src/relphot/src/plotstuff.c

@@ -17 +17 @@
   fprintf (stderr, "kapa is dead, must restart\n");
   Xgraph[active] = -1;
+}
+
+int get_graph (int N) {
+  return Xgraph[N];
 }
 
@@ -156 +160 @@
 }
 
+// plot the vector pair to a file with name defined by the varargs format
+void plot_list_add (Graphdata *graphdata, double *xlist, double *ylist, int Npts) {
+
+  KapaPrepPlot (Xgraph[0], Npts, graphdata);
+  PlotVector (Npts, xlist, 0, 0, "x");
+  PlotVector (Npts, ylist, 1, 0, "y");
+}
+
 void plot_defaults (Graphdata *graphdata) {