Changeset 12332 for trunk/Ohana/src/opihi/dvo/paverage.c

Timestamp:

Mar 8, 2007, 12:21:18 PM (19 years ago)

Author:

eugene

Message:

complete merge from branch dvo-mods-2007-02

File:

• trunk/Ohana/src/opihi/dvo/paverage.c (modified) (5 diffs)

trunk/Ohana/src/opihi/dvo/paverage.c

@@ -5 +5 @@
   
   FILE *f;
-  int i, j, k, m, Narg, Npts, NPTS, status, VERBOSE;
+  int i, j, Narg, Npts, NPTS, status, VERBOSE;
   int Nsecfilt, Nsec;
   double Mz, Mr, mag;
   double Radius, Rmin, Rmax, R, D;
   unsigned IDclip, IDchoice, LimExclude;
-  unsigned FlagChoice, FlagClip, flags;
   float *Xvec, *Yvec, *Zvec;
 
@@ -32 +31 @@
   Rmax = graphmode.coords.crval1 + 182.0;
 
-  Nsec = -1;
+  // require a photcode?  default to 0?
+  Nsec = 0;
   if ((Narg = get_argument (argc, argv, "-p"))) {
     remove_argument (Narg, &argc, argv);
@@ -42 +42 @@
     remove_argument (Narg, &argc, argv);
     Nsec = GetPhotcodeNsec (photcode[0].code);
+    if (Nsec == -1) {
+        fprintf (stderr, "photcode %s is not an AVERAGE photcode\n", argv[Narg]);
+        return (FALSE);
+    }
   }
 
@@ -109 +113 @@
 
     average = catalog.average;
+    secfilt = catalog.secfilt;
 
     /* project stars to screen display coords */
@@ -116 +121 @@
       while (average[i].R > Rmax) average[i].R -= 360.0;
 
-      mag = (Nsec == -1) ? average[i].M : secfilt[i*Nsecfilt+Nsec].M_PS;
+      mag = secfilt[i*Nsecfilt+Nsec].M;
       Zvec[Npts] = MIN (1.0, MAX (0.01, (mag - Mz) / Mr));
       if (LimExclude && (Zvec[Npts] > 0.99)) continue;