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

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

@@ -4 +4 @@
   
   int i, j, k, m, N, N1, NPTS;
-  int param, mode, Nsec;
+  int param, mode, Nsecfilt;
   char *RegionName, *RegionList, *p;
   double *M1;
@@ -23 +23 @@
   /* load photcode information */
   if (!InitPhotcodes ()) goto escape;
-  Nsec = GetPhotcodeNsecfilt ();
+  Nsecfilt = GetPhotcodeNsecfilt ();
 
   /* interpret command-line options */
@@ -57 +57 @@
     catalog.filename = skylist[0].filename[i];
     catalog.catflags = LOAD_AVES | LOAD_MEAS | LOAD_SECF;
-    catalog.Nsecfilt = Nsec;
+    catalog.Nsecfilt = Nsecfilt;
 
     // an error exit status here is a significant error
@@ -66 +66 @@
     dvo_catalog_unlock (&catalog);
 
+    /* XXX need to call dvo_catalog_chipcoords here passing the loaded images */
+
     for (j = 0; j < catalog.Naverage; j++) {
       M1 = NULL;
       m = catalog.average[j].offset;
-      M1 = ExtractMeasures (code, mode, &catalog.average[j], &catalog.secfilt[j*Nsec], &catalog.measure[m], &N1, param);
+      M1 = ExtractMeasures (code, mode, &catalog.average[j], &catalog.secfilt[j*Nsecfilt], &catalog.measure[m], &N1, param);
       for (k = 0; k < N1; k++) {
         vec[0].elements[N] = M1[k];