Changeset 20936 for trunk/Ohana/src/opihi/dvo/ccd.c

Timestamp:

Dec 7, 2008, 3:31:01 PM (18 years ago)

Author:

eugene

Message:

big update from eam_branch_20081124 with updates to Opihi math

File:

• trunk/Ohana/src/opihi/dvo/ccd.c (modified) (2 diffs)

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

@@ -51 +51 @@
 
   /* init vectors to save data */
-  Npts = 0;
-  NPTS = 1;
   if ((xvec = SelectVector ("xv", ANYVECTOR, TRUE)) == NULL) goto escape;
   if ((yvec = SelectVector ("yv", ANYVECTOR, TRUE)) == NULL) goto escape;
+
+  gprint (GP_ERR, "warning: this function may be deprecated in the future -- use avextract for better control\n");
+
+  Npts = 0;
+  NPTS = 100;
+  ResetVector (xvec, OPIHI_FLT, NPTS);
+  ResetVector (yvec, OPIHI_FLT, NPTS);
 
   // grab data from all selected sky regions
@@ -97 +102 @@
       for (i1 = 0; i1 < N1; i1++) {
         for (i2 = 0; i2 < N2; i2++) {
-          xvec[0].elements[Npts] = M1[i1];
-          yvec[0].elements[Npts] = M2[i2];
+          xvec[0].elements.Flt[Npts] = M1[i1];
+          yvec[0].elements.Flt[Npts] = M2[i2];
           Npts++;
           if (Npts >= NPTS) {
             NPTS += 2000;
-            REALLOCATE (xvec[0].elements, float, NPTS);
-            REALLOCATE (yvec[0].elements, float, NPTS);
+            REALLOCATE (xvec[0].elements.Flt, opihi_flt, NPTS);
+            REALLOCATE (yvec[0].elements.Flt, opihi_flt, NPTS);
           }
         }