Changeset 37035 for trunk/Ohana/src/libdvo/src/dvo_convert_elixir.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_elixir.c (modified) (11 diffs)

trunk/Ohana/src/libdvo/src/dvo_convert_elixir.c

@@ -2 +2 @@
 
 /* convert elixir-format measures to internal measures */
-Measure *Measure_Elixir_ToInternal (Measure_Elixir *in, off_t Nvalues) {
+Measure *Measure_Elixir_ToInternal (Average *ave, Measure_Elixir *in, off_t Nvalues) {
 
   off_t i;
@@ -15 +15 @@
     out[i].averef   = in[i].averef;
 
+    // changed for PS1_V5
+    int averef = out[i].averef;
+    out[i].R          = (in[i].dR == NAN_S_SHORT) ? NAN : ave[averef].R - 0.01 * in[i].dR / 3600.0;
+    out[i].D          = (in[i].dD == NAN_S_SHORT) ? NAN : ave[averef].D - 0.01 * in[i].dD / 3600.0;
+
     // changed for PANSTARRS_DEV_0
-    out[i].dR       = (in[i].dR      == NAN_S_SHORT) ? NAN : in[i].dR     * 0.01;
-    out[i].dD       = (in[i].dD      == NAN_S_SHORT) ? NAN : in[i].dD     * 0.01;
     out[i].M        = (in[i].M       == NAN_S_SHORT) ? NAN : in[i].M      * 0.001;
     out[i].dM       = (in[i].dM      == NAN_U_CHAR)  ? NAN : in[i].dM     * 0.001;
@@ -47 +50 @@
 
 /* convert internal measures to elixir-format measures */
-Measure_Elixir *MeasureInternalTo_Elixir (Measure *in, off_t Nvalues) {
+Measure_Elixir *MeasureInternalTo_Elixir (Average *ave, Measure *in, off_t Nvalues) {
 
   off_t i;
@@ -59 +62 @@
     out[i].averef  = in[i].averef;
 
+    // changed for PS1_V5
+    int averef = in[i].averef;
+    int isBad = isnan(in[i].R) || isnan(in[i].D);
+    out[i].dR     = isBad ? NAN_S_SHORT : 100.0*3600.0*(ave[averef].R - in[i].R);
+    out[i].dD     = isBad ? NAN_S_SHORT : 100.0*3600.0*(ave[averef].D - in[i].D);
+
     // changed for PANSTARRS_DEV_0
-    out[i].dR       = isnan(in[i].dR     ) ? NAN_S_SHORT : in[i].dR      *  100.0;
-    out[i].dD       = isnan(in[i].dD     ) ? NAN_S_SHORT : in[i].dD      *  100.0;
     out[i].M        = isnan(in[i].M      ) ? NAN_S_SHORT : in[i].M       * 1000.0;
     out[i].dM       = isnan(in[i].dM     ) ? NAN_U_CHAR  : in[i].dM      * 1000.0;
@@ -104 +111 @@
     primary[0][i].M     = (in[i].M  == NAN_S_SHORT) ? NAN : in[i].M  * 0.001;      
     primary[0][i].dM    = (in[i].dM == NAN_S_SHORT) ? NAN : in[i].dM * 0.001;      
-    primary[0][i].Xm    = in[i].Xm;     
+    primary[0][i].Mchisq= pow (10.0, 0.01*in[i].Xm);     
 
     // added for PANSTARRS_DEV_0
@@ -137 +144 @@
     out[i].M       = isnan(primary[i].M)  ? NAN_S_SHORT : primary[i].M   * 1000.0;
     out[i].dM      = isnan(primary[i].dM) ? NAN_S_SHORT : primary[i].dM  * 1000.0;
-    out[i].Xm      = primary[i].Xm;     
+    out[i].Xm      = 100.0*log10(primary[i].Mchisq);     
 
     // changed or added for PS1_DEV_2
@@ -162 +169 @@
     dvo_secfilt_init (&out[i]);
 
-    out[i].Xm    = in[i].Xm;     
+    out[i].Mchisq = pow (10.0, 0.01*in[i].Xm);     
 
     // added or changed for PANSTARRS_DEV_0
@@ -180 +187 @@
 
   for (i = 0; i < Nvalues; i++) {
-    out[i].Xm    = in[i].Xm;     
+    out[i].Xm    = 100.0*log10(in[i].Mchisq);     
 
     // added or changed for PANSTARRS_DEV_0
@@ -188 +195 @@
   return (out);
 }
+
+# define RAW_IMAGE_NAME_LEN 32
 
 /* convert elixir-format images to internal images */
@@ -203 +212 @@
     memcpy (&out[i].coords, &in[i].coords, sizeof(Coords));
 
-    strncpy (out[i].name, in[i].name, 31); // in[32], out[128]
-    out[i].name[31] = 0; // force termination
+    // RAW_IMAGE_NAME_LEN < DVO_IMAGE_NAME_LEN
+    strncpy (out[i].name, in[i].name, RAW_IMAGE_NAME_LEN - 1);
+    out[i].name[RAW_IMAGE_NAME_LEN - 1] = 0; // force termination
 
     out[i].tzero            = in[i].tzero;
@@ -272 +282 @@
     memcpy (&out[i].coords, &in[i].coords, sizeof(Coords));
 
-    strncpy (out[i].name, in[i].name, 31); // out[32], in[128]
-    out[i].name[31] = 0; // force termination
+    // RAW_IMAGE_NAME_LEN < DVO_IMAGE_NAME_LEN
+    strncpy (out[i].name, in[i].name, RAW_IMAGE_NAME_LEN - 1);
+    out[i].name[RAW_IMAGE_NAME_LEN - 1] = 0; // force termination
 
     out[i].tzero            = in[i].tzero;