Changeset 12461 for trunk/Ohana/src/addstar

Timestamp:

Mar 15, 2007, 3:47:22 PM (19 years ago)

Author:

eugene

Message:

fixing up PS1_DEV_0 I/O format for detections

Location:

trunk/Ohana/src/addstar

Files:

• include/addstar.h (modified) (1 diff)
• src/ReadStarsFITS.c (modified) (3 diffs)
• src/gstars.c (modified) (1 diff)

trunk/Ohana/src/addstar/include/addstar.h

@@ -196 +196 @@
 Missing   *sort_missing           PROTO((Average *average, int Naverage, Missing *missing, int Nmissing, int *next_miss));
 Stars     *ConvertSMPDATA         PROTO((FTable *table, int *nstars));
-// Stars *ConvertPS1DATA          PROTO((FTable *table, int *nstars));
+Stars     *ConvertPS1_DEV_0       PROTO((FTable *table, int *nstars));
 int        ImageOptions           PROTO((AddstarClientOptions *options, Image *images, int Nimages));
 int        GetFileMode            PROTO((Header *header));

trunk/Ohana/src/addstar/src/ReadStarsFITS.c

@@ -34 +34 @@
     stars = ConvertSMPDATA (&table, &Nstars);
   }
-# if (0)
-  if (!strcmp (type, "PS1DATA")) {
-    stars = ConvertPS1DATA (&table, &Nstars);
+  if (!strcmp (type, "PS1_DEV_0")) {
+    stars = ConvertPS1_DEV_0 (&table, &Nstars);
   }
-# endif
   if (stars == NULL) {
     fprintf (stderr, "ERROR: invalid table type %s\n", type);
@@ -60 +58 @@
   /* XXX we need to check at least the size of the loaded table */
 
+  // XXX use memset to zero-out the elements before setting
   ALLOCATE (stars, Stars, Nstars);
   for (i = 0; i < Nstars; i++) {
@@ -78 +77 @@
 }
 
-# if (0)
-Stars *ConvertPS1DATA (FTable *table, int *nstars) {
+Stars *ConvertPS1_DEV_0 (FTable *table, int *nstars) {
 
   int i, Nstars;
   Stars *stars;
-  PS1Data *ps1data;
+  PS1_DEV_0 *ps1data;
 
-  ps1data = gfits_table_get1Data (table, &Nstars, NULL);
+  ps1data = gfits_table_get_PS1_DEV_0 (table, &Nstars, NULL);
 
   ALLOCATE (stars, Stars, Nstars);
   for (i = 0; i < Nstars; i++) {
-    stars[i].X      = ps1data[i].X;
-    stars[i].Y      = ps1data[i].Y;
-    stars[i].M      = ps1data[i].M;
-    stars[i].dM     = ps1data[i].dM;
-    stars[i].dophot = ps1data[i].dophot;
+    stars[i].X       = ps1data[i].X;
+    stars[i].Y       = ps1data[i].Y;
+    stars[i].dX      = ps1data[i].dX;
+    stars[i].dY      = ps1data[i].dY;
+    stars[i].M       = ps1data[i].M;
+    stars[i].dM      = ps1data[i].dM;
+    stars[i].Mpeak   = ps1data[i].Mpeak;
 
-    stars[i].Mgal   = ps1data[i].M;
-    stars[i].Map    = ps1data[i].dM;
-    stars[i].fx     = ps1data[i].fx;
-    stars[i].fy     = ps1data[i].fy;
-    stars[i].df     = ps1data[i].df;
+    stars[i].sky     = ps1data[i].sky;
+    stars[i].dsky    = ps1data[i].dSky;
+
+    stars[i].fx      = ps1data[i].fx;
+    stars[i].fy      = ps1data[i].fy;
+    stars[i].df      = ps1data[i].df;
+
+    stars[i].psfProb = ps1data[i].psfProb;
+    stars[i].psfQual = ps1data[i].psfQual;
+
+    stars[i].detID   = ps1data[i].detID;
+
+    /* these are set elsewhere */
+    stars[i].R       = 0.0;
+    stars[i].D       = 0.0;
+    stars[i].dR      = 0.0;
+    stars[i].dD      = 0.0;
+
+    stars[i].uR      = 0.0;
+    stars[i].uD      = 0.0;
+    stars[i].duR     = 0.0;
+    stars[i].duD     = 0.0;
+
+    stars[i].P       = 0.0;
+    stars[i].dP      = 0.0;
+
+    stars[i].Mcal    = 0;
+    stars[i].t       = 0;
+    stars[i].dt      = 0;
+    stars[i].airmass = 0;
+    stars[i].code    = 0;
+    stars[i].found   = 0;
+
+    /* these are not used */
+    stars[i].Map     = NO_MAG;
+    stars[i].Mgal    = NO_MAG;
+    stars[i].dophot  = 0;
   }    
   *nstars = Nstars;
   return (stars);
 }
-# endif

trunk/Ohana/src/addstar/src/gstars.c

@@ -156 +156 @@
       extsize[i] = headers[i][0].size + gfits_matrix_size (headers[i]);
       gfits_scan (headers[i], "EXTTYPE", "%s", 1, tmpword);
+
       if (!strcmp (tmpword, "SMPDATA") ||  
-          !strcmp (tmpword, "PS1DATA")) {
+          !strcmp (tmpword, "PS1_DEV_0")) {
+
           exttype[Nimage] = strcreate (tmpword);
           gfits_scan (headers[i], "EXTNAME", "%s", 1, tmpword);