Changeset 4825

Timestamp:

Aug 19, 2005, 4:32:02 PM (21 years ago)

Author:

eugene

Message:

using full photometry conversions

File:

• trunk/Ohana/src/addstar/src/find_matches.c (modified) (3 diffs)

trunk/Ohana/src/addstar/src/find_matches.c

@@ -13 +13 @@
   Coords tcoords;
   int Nsecfilt, Nsec, MTIME;
-  short int Mrel, *Mval;
+  short int Mcat, *Mval;
 
   /* photcode data - must by of type DEP, (PRI, SEC) - probably should restrict to DEP */
@@ -165 +165 @@
       catalog[0].measure[Nmeas].theta    = MIN ((255/360)*stars[N].df, NO_ERR);
         
-      /*** this should probably use the mag lookup functions - zeropoints are incorrectly applied ***/
       /* it is not valid to pass PRI/SEC/REF photcodes to this routine */
       /* check for entries in the secfilt lists */
-      Mrel = catalog[0].measure[Nmeas].M + secz * thiscode[0].K;
+      Mcat = iPhotCat (&catalog[0].measure[Nmeas]);
       Mval = (Nsec == -1) ? &catalog[0].average[n].M : &catalog[0].secfilt[n*Nsecfilt+Nsec].M;
-      if (*Mval == NO_MAG) *Mval = Mrel;
+      if (*Mval == NO_MAG) *Mval = Mcat;
 
       /** this is a little tricky: the new measures are not in the measure sequence
@@ -292 +291 @@
     catalog[0].measure[Nmeas].theta    = MIN ((255/360)*stars[N].df, NO_ERR);
 
-    Mrel = catalog[0].measure[Nmeas].M + secz * thiscode[0].K;
+    Mcat = iPhotCat (&catalog[0].measure[Nmeas]);
     Mval = (Nsec == -1) ? &catalog[0].average[Nave].M : &catalog[0].secfilt[Nave*Nsecfilt+Nsec].M;
-    if (*Mval == NO_MAG) *Mval = Mrel;
+    if (*Mval == NO_MAG) *Mval = Mcat;
 
     /** now add references from all previous non-detection observations of this spot on the sky */