Changeset 12332 for trunk/Ohana/src/opihi/dvo/avextract.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/avextract.c (modified) (3 diffs)

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

@@ -4 +4 @@
   
   int i, j, m, N, NPTS, param;
-  int Nsec, mode;
+  int Nsecfilt, mode;
   char *RegionName, *RegionList, *p;
 
@@ -22 +22 @@
   /* load photcode information */
   if (!InitPhotcodes ()) goto escape;
-  Nsec = GetPhotcodeNsecfilt ();
+  Nsecfilt = GetPhotcodeNsecfilt ();
 
   /* interpret command-line options */
@@ -68 +68 @@
     for (j = 0; j < catalog.Naverage; j++) {
       m = catalog.average[j].offset;
-      vec[0].elements[N] = ExtractAverages (code, mode, &catalog.average[j], &catalog.secfilt[j*Nsec], &catalog.measure[m], param);
+      vec[0].elements[N] = ExtractAverages (code, mode, &catalog.average[j], &catalog.secfilt[j*Nsecfilt], &catalog.measure[m], param);
       N++;
       CHECK_REALLOCATE (vec[0].elements, float, NPTS, N, 2000);