Changeset 39211

Timestamp:

Dec 2, 2015, 8:48:17 PM (11 years ago)

Author:

eugene

Message:

forgot to pass uRgal, uDgal back out

File:

• branches/eam_branches/ipp-20151113/Ohana/src/relastro/src/BrightCatalog.c (modified) (8 diffs)

branches/eam_branches/ipp-20151113/Ohana/src/relastro/src/BrightCatalog.c

@@ -159 +159 @@
     GET_COLUMN(uR,             "U_RA",           float);
     GET_COLUMN(uD,             "U_DEC",          float);
-    GET_COLUMN(duR,            "V_RA_ERR",       float);
-    GET_COLUMN(duD,            "V_DEC_ERR",      float);
+    GET_COLUMN(duR,            "U_RA_ERR",       float);
+    GET_COLUMN(duD,            "U_DEC_ERR",      float);
+    GET_COLUMN(uRgal,          "U_RA_GAL",       float);
+    GET_COLUMN(uDgal,          "U_DEC_GAL",      float);
     GET_COLUMN(P,              "PAR",            float);
     GET_COLUMN(dP,             "PAR_ERR",        float);
@@ -197 +199 @@
       average[i].duR             = duR[i]             ;
       average[i].duD             = duD[i]             ;
+      average[i].uRgal           = uRgal[i]           ;
+      average[i].uDgal           = uDgal[i]           ;
       average[i].P               = P[i]               ;
       average[i].dP              = dP[i]              ;
@@ -230 +234 @@
     free (duR);
     free (duD);
+    free (uRgal);
+    free (uDgal);
     free (P);
     free (dP);
@@ -526 +532 @@
     float    *duR           ; ALLOCATE (duR           , float   , catalog->Naverage);
     float    *duD           ; ALLOCATE (duD           , float   , catalog->Naverage);
+    float    *uRgal         ; ALLOCATE (uRgal         , float   , catalog->Naverage);
+    float    *uDgal         ; ALLOCATE (uDgal         , float   , catalog->Naverage);
     float    *P             ; ALLOCATE (P             , float   , catalog->Naverage);
     float    *dP            ; ALLOCATE (dP            , float   , catalog->Naverage);
@@ -560 +568 @@
       duR[i]             = average[i].duR             ;
       duD[i]             = average[i].duD             ;
+      uRgal[i]           = average[i].uRgal           ;
+      uDgal[i]           = average[i].uDgal           ;
       P[i]               = average[i].P               ;
       dP[i]              = average[i].dP              ;
@@ -591 +601 @@
     gfits_set_bintable_column (&theader, &ftable, "U_RA",           uR,              catalog->Naverage);
     gfits_set_bintable_column (&theader, &ftable, "U_DEC",          uD,              catalog->Naverage);
-    gfits_set_bintable_column (&theader, &ftable, "V_RA_ERR",       duR,             catalog->Naverage);
-    gfits_set_bintable_column (&theader, &ftable, "V_DEC_ERR",      duD,             catalog->Naverage);
+    gfits_set_bintable_column (&theader, &ftable, "U_RA_ERR",       duR,             catalog->Naverage);
+    gfits_set_bintable_column (&theader, &ftable, "U_DEC_ERR",      duD,             catalog->Naverage);
+    gfits_set_bintable_column (&theader, &ftable, "U_RA_GAL",       uRgal,           catalog->Naverage);
+    gfits_set_bintable_column (&theader, &ftable, "U_DEC_GAL",      uDgal,           catalog->Naverage);
     gfits_set_bintable_column (&theader, &ftable, "PAR",            P,               catalog->Naverage);
     gfits_set_bintable_column (&theader, &ftable, "PAR_ERR",        dP,              catalog->Naverage);
@@ -604 +616 @@
     gfits_set_bintable_column (&theader, &ftable, "NMEASURE",       Nmeasure,        catalog->Naverage);
     gfits_set_bintable_column (&theader, &ftable, "NMISSING",       Nmissing,        catalog->Naverage);
-    gfits_set_bintable_column (&theader, &ftable, "NGALPHOT",      Ngalphot,       catalog->Naverage);
+    gfits_set_bintable_column (&theader, &ftable, "NGALPHOT",       Ngalphot,        catalog->Naverage);
     gfits_set_bintable_column (&theader, &ftable, "OFF_MEASURE",    measureOffset,   catalog->Naverage);
     gfits_set_bintable_column (&theader, &ftable, "OFF_MISSING",    missingOffset,   catalog->Naverage);
@@ -624 +636 @@
     free (duR);
     free (duD);
+    free (uRgal);
+    free (uDgal);
     free (P);
     free (dP);