Changeset 37035 for trunk/Ohana/src/libdvo/src/dvo_convert_PS1_V2.c

Timestamp:

Jul 17, 2014, 10:10:16 AM (12 years ago)

Author:

eugene

Message:

major re-work of dvo photcode-based-field parsing; adding PS1_V5 and lensing parameters, adding reference colors blue & red

File:

• trunk/Ohana/src/libdvo/src/dvo_convert_PS1_V2.c (modified) (12 diffs)

trunk/Ohana/src/libdvo/src/dvo_convert_PS1_V2.c

@@ -3 +3 @@
 /* convert PS1_V2 formats to internal formats */
 
-Measure *Measure_PS1_V2_ToInternal (Measure_PS1_V2 *in, off_t Nvalues) {
+Measure *Measure_PS1_V2_ToInternal (Average *ave, Measure_PS1_V2 *in, off_t Nvalues) {
 
   off_t i;
@@ -13 +13 @@
     dvo_measure_init (&out[i]);
 
-    out[i].dR         = in[i].dR;
-    out[i].dD         = in[i].dD;
+    int averef = in[i].averef;
+    out[i].R          = ave[averef].R - in[i].dR / 3600.0;
+    out[i].D          = ave[averef].D - in[i].dD / 3600.0;
     out[i].M          = in[i].M;
     out[i].Mcal       = in[i].Mcal;
@@ -59 +60 @@
 }
 
-Measure_PS1_V2 *MeasureInternalTo_PS1_V2 (Measure *in, off_t Nvalues) {
+Measure_PS1_V2 *MeasureInternalTo_PS1_V2 (Average *ave, Measure *in, off_t Nvalues) {
 
   off_t i;
@@ -67 +68 @@
 
   for (i = 0; i < Nvalues; i++) {
-    out[i].dR         = in[i].dR;
-    out[i].dD         = in[i].dD;
+    int averef = in[i].averef;
+
+    out[i].dR         = 3600.0*(ave[averef].R - in[i].R);
+    out[i].dD         = 3600.0*(ave[averef].D - in[i].D);
     out[i].M          = in[i].M;
     out[i].Mcal       = in[i].Mcal;
@@ -145 +148 @@
     out[i].measureOffset = in[i].measureOffset; 
     out[i].missingOffset = in[i].missingOffset;
-    out[i].refColor  = in[i].refColor;
+    out[i].refColorBlue  = in[i].refColor;
     out[i].flags         = in[i].flags;   
     out[i].objID         = in[i].objID;
@@ -184 +187 @@
     out[i].measureOffset = in[i].measureOffset; 
     out[i].missingOffset = in[i].missingOffset;
-    out[i].refColor  = in[i].refColor;
+    out[i].refColor  = in[i].refColorBlue;
     out[i].flags         = in[i].flags;   
     out[i].objID         = in[i].objID;
@@ -205 +208 @@
     out[i].M     = in[i].M;      
     out[i].dM    = in[i].dM;      
-    out[i].Xm    = in[i].Xm;     
+    out[i].Mchisq= in[i].Mchisq;     
     out[i].flags = in[i].flags;     
     out[i].Ncode = in[i].Ncode;
     out[i].Nused = in[i].Nused;
-    out[i].M_20  = in[i].M_20;      
-    out[i].M_80  = in[i].M_80;      
+    out[i].Mmin  = in[i].M_20*0.001;      
+    out[i].Mmax  = in[i].M_80*0.001;      
  }
   return (out);
@@ -225 +228 @@
     out[i].M     = in[i].M;      
     out[i].dM    = in[i].dM;      
-    out[i].Xm    = in[i].Xm;     
+    out[i].Mchisq= in[i].Mchisq;     
     out[i].flags = in[i].flags;     
     out[i].Ncode = in[i].Ncode;
     out[i].Nused = in[i].Nused;
-    out[i].M_20  = in[i].M_20;      
-    out[i].M_80  = in[i].M_80;      
-  }
-  return (out);
-}
+    out[i].M_20  = in[i].Mmin*1000.0;      
+    out[i].M_80  = in[i].Mmax*1000.0;      
+  }
+  return (out);
+}
+
+# define RAW_IMAGE_NAME_LEN 121
 
 Image *Image_PS1_V2_ToInternal (Image_PS1_V2 *in, off_t Nvalues, off_t Nalloc) {
@@ -248 +253 @@
     memcpy (&out[i].coords, &in[i].coords, sizeof(Coords));
 
-    strncpy (out[i].name, in[i].name, 120); // out[121], in[121]
-    out[i].name[120] = 0; // force termination
+    // RAW_IMAGE_NAME_LEN > DVO_IMAGE_NAME_LEN
+    strncpy (out[i].name, in[i].name, DVO_IMAGE_NAME_LEN - 1);
+    out[i].name[DVO_IMAGE_NAME_LEN - 1] = 0; // force termination
 
     out[i].tzero            = in[i].tzero;
@@ -269 +275 @@
     out[i].DECo             = in[i].DECo;
     out[i].Radius           = in[i].Radius;
-    out[i].refColor         = in[i].refColor;
+    out[i].refColorBlue             = in[i].refColor;
 
     out[i].detection_limit  = in[i].detection_limit;
@@ -311 +317 @@
     memcpy (&out[i].coords, &in[i].coords, sizeof(Coords));
 
-    strncpy (out[i].name, in[i].name, 120); // out[121], in[121]
-    out[i].name[120] = 0; // force termination
+    // RAW_IMAGE_NAME_LEN > DVO_IMAGE_NAME_LEN
+    strncpy (out[i].name, in[i].name, DVO_IMAGE_NAME_LEN - 1);
+    out[i].name[DVO_IMAGE_NAME_LEN - 1] = 0; // force termination
 
     out[i].tzero            = in[i].tzero;
@@ -332 +339 @@
     out[i].DECo             = in[i].DECo;
     out[i].Radius           = in[i].Radius;
-    out[i].refColor         = in[i].refColor;
+    out[i].refColor         = in[i].refColorBlue;
 
     out[i].detection_limit  = in[i].detection_limit;