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

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

@@ -6 +6 @@
   float *RA, *DEC;
   int Nstars, found, PhotCodeSelect;
-  int i, j, k, m, N, NPTS, Nsec, RELPHOT, *N1, TimeFormat;
+  int i, j, k, m, N, NPTS, Nsecfilt, RELPHOT, *N1, TimeFormat;
   time_t TimeReference;
 
@@ -16 +16 @@
 
   if (!InitPhotcodes ()) return (FALSE);
-  Nsec = GetPhotcodeNsecfilt ();
+  Nsecfilt = GetPhotcodeNsecfilt ();
 
   if ((tvec = SelectVector ("tc", ANYVECTOR, TRUE)) == NULL) return (FALSE);
@@ -110 +110 @@
         if (PhotCodeSelect) {
           if ((code[0].type == PHOT_REF) || (code[0].type == PHOT_DEP)) {
-            if (code[0].code != catalog.measure[m].source) continue;
+            if (code[0].code != catalog.measure[m].photcode) continue;
           } 
-          if ((code[0].type == PHOT_PRI) || (code[0].type == PHOT_SEC)) {
-            if (code[0].code != GetPhotcodeEquivCodebyCode (catalog.measure[m].source)) continue;
+          if (code[0].type == PHOT_SEC) {
+            if (code[0].code != GetPhotcodeEquivCodebyCode (catalog.measure[m].photcode)) continue;
           } 
         }      
 
         tvec[0].elements[N] = TimeValue (catalog.measure[m].t, TimeReference, TimeFormat);
-        dmvec[0].elements[N] = catalog.measure[m].dM_PS;
+        dmvec[0].elements[N] = catalog.measure[m].dM;
         if (RELPHOT) {
           mvec[0].elements[N] = PhotCat (&catalog.measure[m]);
         } else {
-          mvec[0].elements[N] = PhotRel (&catalog.measure[m], &catalog.average[k], &catalog.secfilt[k*Nsec]);
+          mvec[0].elements[N] = PhotRel (&catalog.measure[m], &catalog.average[k], &catalog.secfilt[k*Nsecfilt]);
         }
         N++;