Changeset 15038 for trunk/Ohana/src/addstar/src/find_matches_closest.c

Timestamp:

Sep 26, 2007, 5:34:27 PM (19 years ago)

Author:

eugene

Message:

various fixes to ensure data is carried from Stars to Measures correctly for PS1_DEV_1

File:

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

trunk/Ohana/src/addstar/src/find_matches_closest.c

@@ -193 +193 @@
     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].dbFlags  = 0;
     catalog[0].measure[Nmeas].dt       = stars[N].dt;
     catalog[0].measure[Nmeas].airmass  = stars[N].airmass;
+
+    catalog[0].measure[Nmeas].photFlags = stars[N].flags;
+    catalog[0].measure[Nmeas].qPSF      = stars[N].psfQual;
+    catalog[0].measure[Nmeas].psfProb   = stars[N].psfProb;
+    catalog[0].measure[Nmeas].crNsigma  = stars[N].crNsigma;
+    catalog[0].measure[Nmeas].extNsigma = stars[N].extNsigma;
+    catalog[0].measure[Nmeas].Sky       = stars[N].sky;
+    catalog[0].measure[Nmeas].dSky      = stars[N].dsky;
+
+    catalog[0].measure[Nmeas].stargal   = 0;
+
+    catalog[0].measure[Nmeas].detID     = stars[N].detID;
+    catalog[0].measure[Nmeas].imageID   = options.imageID;
+
+    catalog[0].measure[Nmeas].dXccd     = stars[N].dX;
+    catalog[0].measure[Nmeas].dYccd     = stars[N].dY;
 
     catalog[0].measure[Nmeas].Mgal     = stars[N].Mgal;
@@ -270 +286 @@
     }
 
-    /* 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;
@@ -284 +298 @@
     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].dbFlags  = 0;
     catalog[0].measure[Nmeas].dt       = stars[N].dt;
     catalog[0].measure[Nmeas].airmass  = stars[N].airmass;
+
+    catalog[0].measure[Nmeas].photFlags = stars[N].flags;
+    catalog[0].measure[Nmeas].qPSF      = stars[N].psfQual;
+    catalog[0].measure[Nmeas].psfProb   = stars[N].psfProb;
+    catalog[0].measure[Nmeas].crNsigma  = stars[N].crNsigma;
+    catalog[0].measure[Nmeas].extNsigma = stars[N].extNsigma;
+    catalog[0].measure[Nmeas].Sky       = stars[N].sky;
+    catalog[0].measure[Nmeas].dSky      = stars[N].dsky;
+
+    catalog[0].measure[Nmeas].stargal   = 0;
+
+    catalog[0].measure[Nmeas].detID     = stars[N].detID;
+    catalog[0].measure[Nmeas].imageID   = options.imageID;
+
+    catalog[0].measure[Nmeas].dXccd     = stars[N].dX;
+    catalog[0].measure[Nmeas].dYccd     = stars[N].dY;
 
     catalog[0].measure[Nmeas].Mgal     = stars[N].Mgal;