Changeset 25027 for branches/pap/psastro/src/psastroLoadRefstars.c

Timestamp:

Aug 7, 2009, 4:08:25 PM (17 years ago)

Author:

Paul Price

Message:

Merging trunk (r25026) to get up-to-date on old branch.

Location:

branches/pap

Files:

• . (modified) (1 prop)
• psastro (modified) (1 prop)
• psastro/src/psastroLoadRefstars.c (modified) (3 diffs)

branches/pap/psastro/src/psastroLoadRefstars.c

@@ -128 +128 @@
     if (!strcmp (outformat, "PS1_DEV_0")) {
       refstars = psastroReadGetstar_PS1_DEV_0 (fits);
+
+      // XXX test
+      // FILE *outfile = fopen ("refstars.dat", "w");
+      // assert (outfile);
+      // for (int nn = 0; nn < refstars->n; nn++) {
+      //          pmAstromObj *ref = refstars->data[nn];
+      //          fprintf (outfile, "%lf %lf\n", ref->sky->r*PS_DEG_RAD, ref->sky->d*PS_DEG_RAD);
+      // }
+      // fclose (outfile);
     }
     if (refstars == NULL) {
@@ -181 +190 @@
             ref->sky->d   = RAD_DEG*psMetadataLookupF32 (&status, row, "DEC");
             ref->Mag      = 0.001*psMetadataLookupS32 (&status, row, "MAG");  // ELIXIR uses millimags
+            ref->Color    = 0.0;
         } else {
             ref->sky->r   = RAD_DEG*psMetadataLookupF64 (&status, row, "RA");
             ref->sky->d   = RAD_DEG*psMetadataLookupF64 (&status, row, "DEC");
             ref->Mag      = psMetadataLookupF32 (&status, row, "MAG"); // PANSTARRS uses mags
+            ref->Color    = 0.0;
         }
 
@@ -216 +227 @@
         psMetadata *row = psFitsReadTableRow(fits, i); // Table row
 
-        ref->sky->r   = RAD_DEG*psMetadataLookupF32 (&status, row, "RA");
-        ref->sky->d   = RAD_DEG*psMetadataLookupF32 (&status, row, "DEC");
+        ref->sky->r   = RAD_DEG*psMetadataLookupF64 (&status, row, "RA");
+        ref->sky->d   = RAD_DEG*psMetadataLookupF64 (&status, row, "DEC");
         ref->Mag      = psMetadataLookupF32 (&status, row, "MAG");
+        float MagC1   = psMetadataLookupF32 (&status, row, "MAG_C1");
+        float MagC2   = psMetadataLookupF32 (&status, row, "MAG_C2");
+        if (!isnan(MagC1) && !isnan(MagC2)) {
+            ref->Color = MagC1 - MagC2;
+        } else {
+            // XXX save the color and the slope in the table header?
+            ref->Color = 0.0;
+        }
 
         // XXX VERY temporary hack to avoid M31 bulge