Changeset 20859 for branches/eam_branch_20081124/Ohana/src/opihi/dvo/calmextract.c

Timestamp:

Nov 30, 2008, 11:13:15 AM (18 years ago)

Author:

eugene

Message:

allow functions to use FLT or INT vectors as appropriate; document valid types

File:

• branches/eam_branch_20081124/Ohana/src/opihi/dvo/calmextract.c (modified) (2 diffs)

branches/eam_branch_20081124/Ohana/src/opihi/dvo/calmextract.c

@@ -38 +38 @@
   if (!TestPhotSelections (&code[0], &mode[0], MEAS_ZERO)) goto escape;
 
+  gprint (GP_ERR, "warning: this function may be deprecated in the future -- use avextract for better control\n");
+
   /* returned vectors are dmag, mag, color, time, airmass, ra, dec, x, y, exptime */
-  N = 0;
-  Nstar = 0;
-  NSTAR = 100;
   ALLOCATE (vec, Vector *, NVEC);
   if ((vec[Nd ] = SelectVector ("cal:dmag",     ANYVECTOR, TRUE)) == NULL) goto escape;
@@ -60 +59 @@
   if ((vec[Nd1] = SelectVector ("cal:dm1",      ANYVECTOR, TRUE)) == NULL) goto escape;
   if ((vec[Nd2] = SelectVector ("cal:dm2",      ANYVECTOR, TRUE)) == NULL) goto escape;
+
+  N = 0;
+  Nstar = 0;
+  NSTAR = 100;
   for (k = 0; k < NVEC; k++) {
-    REALLOCATE (vec[k][0].elements.Flt, opihi_flt, NSTAR);
-    vec[k][0].Nelements = 0;
+    ResetVector (vec[k], OPIHI_FLT, NSTAR);
   }