Changeset 12008 for branches/dvo-mods-2007-02/Ohana/src/addstar/src/find_matches_closest.c

Timestamp:

Feb 22, 2007, 4:05:39 PM (19 years ago)

Author:

eugene

Message:

adding fields needed by DVO for PS1 support; pre-calculating Xccd, Yccd

File:

• branches/dvo-mods-2007-02/Ohana/src/addstar/src/find_matches_closest.c (modified) (3 diffs)

branches/dvo-mods-2007-02/Ohana/src/addstar/src/find_matches_closest.c

@@ -160 +160 @@
     /** add measurements for this star **/
     /** dR,dD now represent arcsec **/
-    catalog[0].measure[Nmeas].dR_PS       = 3600.0*(catalog[0].average[n].R - stars[N].R);
-    if (catalog[0].measure[Nmeas].dR_PS > +180.0*3600.0) {
+    catalog[0].measure[Nmeas].dR       = 3600.0*(catalog[0].average[n].R - stars[N].R);
+    if (catalog[0].measure[Nmeas].dR > +180.0*3600.0) {
       // average on high end of boundary, move star up
       stars[N].R += 360.0;
-      catalog[0].measure[Nmeas].dR_PS = 3600.0*(catalog[0].average[n].R - stars[N].R);
-    }
-    if (catalog[0].measure[Nmeas].dR_PS < -180.0*3600.0) {
+      catalog[0].measure[Nmeas].dR = 3600.0*(catalog[0].average[n].R - stars[N].R);
+    }
+    if (catalog[0].measure[Nmeas].dR < -180.0*3600.0) {
       // average on low end of boundary, move star down
       stars[N].R -= 360.0;
-      catalog[0].measure[Nmeas].dR_PS = 3600.0*(catalog[0].average[n].R - stars[N].R);
-    }
-    if (fabs(catalog[0].measure[Nmeas].dR_PS) > 10*RADIUS) {
+      catalog[0].measure[Nmeas].dR = 3600.0*(catalog[0].average[n].R - stars[N].R);
+    }
+    if (fabs(catalog[0].measure[Nmeas].dR) > 10*RADIUS) {
       fprintf (stderr, "error: %10.6f,%10.6f vs %10.6f,%10.6f (%f,%f vs %f,%f)\n", 
                catalog[0].average[n].R, catalog[0].average[n].D, 
@@ -178 +178 @@
                Y1[i], Y2[Jmin]);
     }
-    catalog[0].measure[Nmeas].dD_PS       = 3600.0*(catalog[0].average[n].D - stars[N].D);
-    catalog[0].measure[Nmeas].M_PS        = stars[N].M;
-    catalog[0].measure[Nmeas].dM_PS       = stars[N].dM;  /* error in input files stored in thousandths of mag */
-    catalog[0].measure[Nmeas].Mcal_PS     = stars[N].Mcal;
-    catalog[0].measure[Nmeas].t           = stars[N].t;
-    catalog[0].measure[Nmeas].averef      = n;
-    catalog[0].measure[Nmeas].source      = stars[N].code;  /* photcode */
-    catalog[0].measure[Nmeas].dophot      = stars[N].dophot;  
-    catalog[0].measure[Nmeas].flags       = 0;
-    catalog[0].measure[Nmeas].dt_PS       = stars[N].dt;
-    catalog[0].measure[Nmeas].airmass_PS  = stars[N].airmass;
-
-    catalog[0].measure[Nmeas].Mgal_PS     = stars[N].Mgal;
-    catalog[0].measure[Nmeas].FWx         = MIN (100*stars[N].fx, NO_MAG);
-    catalog[0].measure[Nmeas].FWy         = MIN (100*stars[N].fy, NO_MAG);
-    catalog[0].measure[Nmeas].theta       = MIN ((255/360)*stars[N].df, NO_ERR);
+    catalog[0].measure[Nmeas].dD       = 3600.0*(catalog[0].average[n].D - stars[N].D);
+
+    /* XXX need to add dX, dY : need to load into stars[N].dX,dY */
+    /* XXX need to add stargal, Sky, dSky, qPSF, detID, imageID */
+    catalog[0].measure[Nmeas].Xccd     = stars[N].X;
+    catalog[0].measure[Nmeas].Yccd     = stars[N].Y;
+
+    catalog[0].measure[Nmeas].M        = stars[N].M;
+    catalog[0].measure[Nmeas].dM       = stars[N].dM;  /* error in input files stored in thousandths of mag */
+    catalog[0].measure[Nmeas].Mcal     = stars[N].Mcal;
+    catalog[0].measure[Nmeas].t        = stars[N].t;
+    catalog[0].measure[Nmeas].averef   = n;
+    catalog[0].measure[Nmeas].photcode = stars[N].code;  /* photcode */
+    catalog[0].measure[Nmeas].dophot   = stars[N].dophot;  
+    catalog[0].measure[Nmeas].flags    = 0;
+    catalog[0].measure[Nmeas].dt       = stars[N].dt;
+    catalog[0].measure[Nmeas].airmass  = stars[N].airmass;
+
+    catalog[0].measure[Nmeas].Mgal     = stars[N].Mgal;
+    catalog[0].measure[Nmeas].FWx      = MIN (100*stars[N].fx, NO_MAG);
+    catalog[0].measure[Nmeas].FWy      = MIN (100*stars[N].fy, NO_MAG);
+    catalog[0].measure[Nmeas].theta    = MIN ((0xffff/360.0)*stars[N].df, NO_MAG);
         
     /* it is not valid to pass PRI/SEC/REF photcodes to this routine */
     /* check for entries in the secfilt lists */
     Mcat = PhotCat (&catalog[0].measure[Nmeas]);
-    Mval = (Nsec == -1) ? &catalog[0].average[n].M : &catalog[0].secfilt[n*Nsecfilt+Nsec].M_PS;
+    Mval = (Nsec == -1) ? &catalog[0].average[n].M : &catalog[0].secfilt[n*Nsecfilt+Nsec].M;
     if (*Mval == NO_MAG) *Mval = Mcat;
     /* in UPDATE mode, this value is not saved; use relphot to recalculate */
@@ -261 +267 @@
 
     for (j = 0; j < Nsecfilt; j++) {
-      catalog[0].secfilt[Nave*Nsecfilt+j].M_PS  = NO_MAG;
-      catalog[0].secfilt[Nave*Nsecfilt+j].dM_PS = NO_MAG;
+      catalog[0].secfilt[Nave*Nsecfilt+j].M  = NO_MAG;
+      catalog[0].secfilt[Nave*Nsecfilt+j].dM = NO_MAG;
       catalog[0].secfilt[Nave*Nsecfilt+j].Xm    = NO_MAG;
     }
 
-    catalog[0].measure[Nmeas].dR_PS       = 0.0;
-    catalog[0].measure[Nmeas].dD_PS       = 0.0;
-    catalog[0].measure[Nmeas].M_PS        = stars[N].M;
-    catalog[0].measure[Nmeas].dM_PS       = stars[N].dM;
-    catalog[0].measure[Nmeas].Mcal_PS     = stars[N].Mcal;
-    catalog[0].measure[Nmeas].t           = stars[N].t;
-    catalog[0].measure[Nmeas].averef      = Nave;
-    catalog[0].measure[Nmeas].source      = stars[N].code;  /* photcode */
-    catalog[0].measure[Nmeas].dophot      = stars[N].dophot;  
-    catalog[0].measure[Nmeas].flags       = 0;
-    catalog[0].measure[Nmeas].dt_PS       = stars[N].dt;
-    catalog[0].measure[Nmeas].airmass_PS  = stars[N].airmass;
-
-    catalog[0].measure[Nmeas].Mgal_PS     = stars[N].Mgal;
-    catalog[0].measure[Nmeas].FWx         = MIN (100*stars[N].fx, NO_MAG);
-    catalog[0].measure[Nmeas].FWy         = MIN (100*stars[N].fy, NO_MAG);
-    catalog[0].measure[Nmeas].theta       = MIN ((255/360)*stars[N].df, NO_ERR);
+    /* XXX need to add dX, dY : need to load into stars[N].dX,dY */
+    /* XXX need to add stargal, Sky, dSky, qPSF, detID, imageID */
+    catalog[0].measure[Nmeas].Xccd     = stars[N].X;
+    catalog[0].measure[Nmeas].Yccd     = stars[N].Y;
+
+    catalog[0].measure[Nmeas].dR       = 0.0;
+    catalog[0].measure[Nmeas].dD       = 0.0;
+    catalog[0].measure[Nmeas].M        = stars[N].M;
+    catalog[0].measure[Nmeas].dM       = stars[N].dM;
+    catalog[0].measure[Nmeas].Mcal     = stars[N].Mcal;
+    catalog[0].measure[Nmeas].t        = stars[N].t;
+    catalog[0].measure[Nmeas].averef   = Nave;
+    catalog[0].measure[Nmeas].photcode = stars[N].code;  /* photcode */
+    catalog[0].measure[Nmeas].dophot   = stars[N].dophot;  
+    catalog[0].measure[Nmeas].flags    = 0;
+    catalog[0].measure[Nmeas].dt       = stars[N].dt;
+    catalog[0].measure[Nmeas].airmass  = stars[N].airmass;
+
+    catalog[0].measure[Nmeas].Mgal     = stars[N].Mgal;
+    catalog[0].measure[Nmeas].FWx      = MIN (100*stars[N].fx, NO_MAG);
+    catalog[0].measure[Nmeas].FWy      = MIN (100*stars[N].fy, NO_MAG);
+    catalog[0].measure[Nmeas].theta    = MIN ((0xffff/360.0)*stars[N].df, NO_ERR);
 
     Mcat = PhotCat (&catalog[0].measure[Nmeas]);
-    Mval = (Nsec == -1) ? &catalog[0].average[Nave].M : &catalog[0].secfilt[Nave*Nsecfilt+Nsec].M_PS;
+    Mval = (Nsec == -1) ? &catalog[0].average[Nave].M : &catalog[0].secfilt[Nave*Nsecfilt+Nsec].M;
     if (*Mval == NO_MAG) *Mval = Mcat;