Changeset 37522

Timestamp:

Oct 22, 2014, 10:24:23 AM (12 years ago)

Author:

eugene

Message:

add R,D to starpar

Location:

branches/eam_branches/ipp-20140904/Ohana/src/addstar/src

Files:

• loadstarpar_io.c (modified) (4 diffs)
• loadstarpar_readstars.c (modified) (1 diff)

branches/eam_branches/ipp-20140904/Ohana/src/addstar/src/loadstarpar_io.c

@@ -28 +28 @@
   gfits_define_bintable_column (&theader, "D", "RA",       "", "degree", 1.0, 0.0);
   gfits_define_bintable_column (&theader, "D", "DEC",      "", "degree", 1.0, 0.0);
-  gfits_define_bintable_column (&theader, "D", "GLON",     "", "degree", 1.0, 0.0);
+  gfits_define_bintable_column (&theader, "E", "GLON",     "", "degree", 1.0, 0.0);
   gfits_define_bintable_column (&theader, "D", "GLAT",     "", "degree", 1.0, 0.0);
   gfits_define_bintable_column (&theader, "E", "Ebv",      "", "", 1.0, 0.0);
@@ -43 +43 @@
 
   int i;
-  double       *ra       = NULL; ALLOCATE (ra      , double      , Nstars); for (i = 0; i < Nstars; i++) ra      [i] = stars[i].R               ;
-  double       *dec      = NULL; ALLOCATE (dec     , double      , Nstars); for (i = 0; i < Nstars; i++) dec     [i] = stars[i].D               ;
-  double       *glon     = NULL; ALLOCATE (glon    , double      , Nstars); for (i = 0; i < Nstars; i++) glon    [i] = stars[i].starpar.galLon  ;
-  double       *glat     = NULL; ALLOCATE (glat    , double      , Nstars); for (i = 0; i < Nstars; i++) glat    [i] = stars[i].starpar.galLat  ;
+  double       *ra       = NULL; ALLOCATE (ra      , double      , Nstars); for (i = 0; i < Nstars; i++) ra      [i] = stars[i].starpar.R ;
+  double       *dec      = NULL; ALLOCATE (dec     , double      , Nstars); for (i = 0; i < Nstars; i++) dec     [i] = stars[i].starpar.D ;
+  float        *glon     = NULL; ALLOCATE (glon    , float       , Nstars); for (i = 0; i < Nstars; i++) glon    [i] = stars[i].starpar.galLon  ;
+  float        *glat     = NULL; ALLOCATE (glat    , float       , Nstars); for (i = 0; i < Nstars; i++) glat    [i] = stars[i].starpar.galLat  ;
   float        *Ebv      = NULL; ALLOCATE (Ebv     , float       , Nstars); for (i = 0; i < Nstars; i++) Ebv     [i] = stars[i].starpar.Ebv     ;
   float        *dEbv     = NULL; ALLOCATE (dEbv    , float       , Nstars); for (i = 0; i < Nstars; i++) dEbv    [i] = stars[i].starpar.dEbv    ;
@@ -136 +136 @@
   GET_COLUMN(ra      , "RA"        ,   double);
   GET_COLUMN(dec     , "DEC"       ,   double);
-  GET_COLUMN(glon    , "GLON"      ,   double);
-  GET_COLUMN(glat    , "GLAT"      ,   double);
+  GET_COLUMN(glon    , "GLON"      ,   float);
+  GET_COLUMN(glat    , "GLAT"      ,   float);
   GET_COLUMN(Ebv     , "Ebv"       ,   float);
   GET_COLUMN(dEbv    , "dEbv"      ,   float);
@@ -159 +159 @@
   for (i = 0; i < Nrow; i++) {
     stars[i].R                = ra      [i];
-    stars[i].D                = dec     [i];
+    stars[i].D                = dec     [i];
+    stars[i].starpar.R        = ra      [i];
+    stars[i].starpar.D        = dec     [i];
     stars[i].starpar.galLon   = glon    [i];
     stars[i].starpar.galLat   = glat    [i];

branches/eam_branches/ipp-20140904/Ohana/src/addstar/src/loadstarpar_readstars.c

@@ -121 +121 @@
     stars[Nstars].found = FALSE;
 
+    // NOTE that we have both stars.R,D and stars.starpar.R,D.  stars.R,D are used 
+    // here (in parallel with addstar) to locate the objects.  BUT, in the database,
+    // starpar.R,D is the authoratative position for the object (either that coming 
+    // from Greg / Eddie's table or that coming from the simulation)
+    stars[Nstars].starpar.R      = R;
+    stars[Nstars].starpar.D      = D;
     stars[Nstars].starpar.galLon = glon[i];
     stars[Nstars].starpar.galLat = glat[i];