Changeset 17203

Timestamp:

Mar 28, 2008, 3:37:17 PM (18 years ago)

Author:

eugene

Message:

remove / rework unneeded globals

Location:

trunk/Ohana/src/relastro/src

Files:

• plot_scatter.c (modified) (2 diffs)
• plotstuff.c (modified) (1 diff)

trunk/Ohana/src/relastro/src/plot_scatter.c

@@ -4 +4 @@
 
 # if (0)   
-  int i, j, k, m, N, Ntot;
+  int i, j, k, m, N, Ntot, Nsecfilt;
   float Mrel, Mcal, Mmos, Mgrid;
   double *xlist, *ylist, *ilist;
   Graphdata graphdata;
+
+  // XXX in the future, use catalog[0].Nsecfilt only?  allow catalogs to have variable Nsecfilt?
+  Nsecfilt = GetPhotcodeNsecfilt ();
+  assert (catalog[0].Nsecfilt == Nsecfilt);
 
   Ntot = 0;
@@ -30 +34 @@
         if (catalog[i].measure[m].flags & MEAS_BAD) continue;
 
-        Mrel = catalog[i].secfilt[PhotNsec*j+PhotSec].M;
+        Mrel = catalog[i].secfilt[Nsecfilt*j+PhotSec].M;
         xlist[N] = Mrel;
-        ylist[N] = PhotSys  (&catalog[i].measure[m], &catalog[i].average[j], &catalog[i].secfilt[j*PhotNsec]) - Mcal - Mmos - Mgrid - Mrel;
+        ylist[N] = PhotSys  (&catalog[i].measure[m], &catalog[i].average[j], &catalog[i].secfilt[j*Nsecfilt]) - Mcal - Mmos - Mgrid - Mrel;
         ilist[N] = PhotInst (&catalog[i].measure[m]);
         N++;

trunk/Ohana/src/relastro/src/plotstuff.c

@@ -4 +4 @@
 static int Xgraph[5] = {0,0,0,0,0};
 static int active;
+
+enum {black, white, red, orange, yellow, green, blue, indigo, violet};
 
 /*