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

Timestamp:

Sep 23, 2014, 5:42:05 PM (12 years ago)

Author:

eugene

Message:

loadstarpar populates the db

File:

• branches/eam_branches/ipp-20140904/Ohana/src/addstar/src/loadstarpar_readstars.c (modified) (2 diffs)

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

@@ -49 +49 @@
   GET_COLUMN (glat,    "l",    float);
   GET_COLUMN (glon,    "b",    float);
-  GET_COLUMN (conv,    "conv", char);
+  GET_COLUMN (conv,    "conv", byte);
   GET_COLUMN (lnZ,     "lnZ",  float);
   GET_COLUMN (DistMag, "DM",   float);
@@ -113 +113 @@
     float dEbv     = 0.5*(errImage[i*20 + 5*0 + 3] - errImage[i*20 + 5*0 + 1]);
     float dDistMag = 0.5*(errImage[i*20 + 5*1 + 3] - errImage[i*20 + 5*1 + 1]);
-    float dFeH     = 0.5*(errImage[i*20 + 5*2 + 3] - errImage[i*20 + 5*2 + 1]);
-    float dM_r     = 0.5*(errImage[i*20 + 5*3 + 3] - errImage[i*20 + 5*3 + 1]);
+    float dM_r     = 0.5*(errImage[i*20 + 5*2 + 3] - errImage[i*20 + 5*2 + 1]);
+    float dFeH     = 0.5*(errImage[i*20 + 5*3 + 3] - errImage[i*20 + 5*3 + 1]);
 
     stars[Nstars].R = R;