Changeset 37521

Timestamp:

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

Author:

eugene

Message:

add R,D to starpar

Location:

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

Files:

• dvo_catalog.c (modified) (1 diff)
• dvo_convert_PS1_SIM.c (modified) (2 diffs)
• dvo_convert_PS1_V5.c (modified) (2 diffs)
• dvo_image.c (modified) (1 diff)

branches/eam_branches/ipp-20140904/Ohana/src/libdvo/src/dvo_catalog.c

@@ -441 +441 @@
 // init all data, or just catalog data
 void dvo_starpar_init (StarPar *starpar) {
+  starpar->R        = NAN;
+  starpar->D        = NAN;
   starpar->galLat   = NAN;
   starpar->galLon   = NAN;

branches/eam_branches/ipp-20140904/Ohana/src/libdvo/src/dvo_convert_PS1_SIM.c

@@ -234 +234 @@
     dvo_starpar_init (&out[i]);
 
-    out[i].galLat  = in[i].galLat;      
-    out[i].galLon  = in[i].galLon;      
+    out[i].R         = in[i].R;      
+    out[i].D         = in[i].D;      
+    out[i].galLat    = in[i].galLat;      
+    out[i].galLon    = in[i].galLon;      
 
     out[i].Ebv       = in[i].Ebv     ;      
@@ -264 +266 @@
   for (i = 0; i < Nvalues; i++) {
 
-    out[i].galLat  = in[i].galLat;      
-    out[i].galLon  = in[i].galLon;      
+    out[i].R         = in[i].R;      
+    out[i].D         = in[i].D;      
+    out[i].galLat    = in[i].galLat;      
+    out[i].galLon    = in[i].galLon;      
 
     out[i].Ebv       = in[i].Ebv     ;      

branches/eam_branches/ipp-20140904/Ohana/src/libdvo/src/dvo_convert_PS1_V5.c

@@ -675 +675 @@
     dvo_starpar_init (&out[i]);
 
-    out[i].galLat  = in[i].galLat;      
-    out[i].galLon  = in[i].galLon;      
+    out[i].R         = in[i].R;      
+    out[i].D         = in[i].D;      
+    out[i].galLat    = in[i].galLat;      
+    out[i].galLon    = in[i].galLon;      
 
     out[i].Ebv       = in[i].Ebv     ;      
@@ -705 +707 @@
   for (i = 0; i < Nvalues; i++) {
 
-    out[i].galLat  = in[i].galLat;      
-    out[i].galLon  = in[i].galLon;      
+    out[i].R         = in[i].R;      
+    out[i].D         = in[i].D;      
+    out[i].galLat    = in[i].galLat;      
+    out[i].galLon    = in[i].galLon;      
 
     out[i].Ebv       = in[i].Ebv     ;      

branches/eam_branches/ipp-20140904/Ohana/src/libdvo/src/dvo_image.c

@@ -255 +255 @@
   srand48(A);
   
+  fprintf (stderr, "%ld : %f\n", A, drand48());
+
   int i;
   for (i = 0; i < 32; i++) {