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

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

@@ -5 +5 @@
   
   int i, m, k, N, Ngraph, SaveVectors;
-  int Ns, Nsec, NPTS;
+  int Nsec, Nsecfilt, NPTS;
   double Radius;
   float dt1, dt2, dmt1, dmt2;
@@ -16 +16 @@
   Vector Xvec, Yvec, Zvec, Rvec, Dvec;
   Vector *vec1, *vec2, *vec3, *vec4, *vec5;
+
+  Dvec.elements = Rvec.elements = Zvec.elements = NULL;
 
   if (!InitPhotcodes ()) return (FALSE);
@@ -44 +46 @@
     return (FALSE);
   }
-  if ((code[0].type != PHOT_SEC) && (code[0].type != PHOT_PRI)) {
-    gprint (GP_ERR, "first filter must be a PRIMARY or SECONDARY photometry type\n");
+  if (code[0].type != PHOT_SEC) {
+    gprint (GP_ERR, "first filter must be a average photometry type\n");
     return (FALSE);
   }
-  Nsec = GetPhotcodeNsecfilt();
-  Ns = GetPhotcodeNsec (code[0].code);
+  Nsecfilt = GetPhotcodeNsecfilt();
+  Nsec = GetPhotcodeNsec (code[0].code);
 
   Radius = MAX (fabs(graphsky.xmax), fabs(graphsky.ymax));
@@ -82 +84 @@
       if (catalog.average[i].Nm != 3) continue;
       m = catalog.average[i].offset;
-      M0 = (Ns == -1) ? catalog.average[i].M : catalog.secfilt[i*Nsec+Ns].M_PS;
+      M0 = catalog.secfilt[i*Nsecfilt+Nsec].M;
       M1 = PhotCat (&catalog.measure[m+0]);
       M2 = PhotCat (&catalog.measure[m+1]);