Changeset 27839 for branches/simmosaic_branches/Ohana/src/libdvo/src/dvo_convert_elixir.c

Timestamp:

May 3, 2010, 8:45:22 AM (16 years ago)

Author:

eugene

Message:

updates from trunk

Location:

branches/simmosaic_branches

Files:

• . (modified) (1 prop)
• Ohana (modified) (1 prop)
• Ohana/src/libdvo/src/dvo_convert_elixir.c (modified) (13 diffs)

branches/simmosaic_branches/Ohana/src/libdvo/src/dvo_convert_elixir.c

@@ -2 +2 @@
 
 /* convert elixir-format measures to internal measures */
-Measure *Measure_Elixir_ToInternal (Measure_Elixir *in, int Nvalues) {
-
-  int i;
+Measure *Measure_Elixir_ToInternal (Measure_Elixir *in, off_t Nvalues) {
+
+  off_t i;
   Measure *out;
 
@@ -69 +69 @@
 
 /* convert internal measures to elixir-format measures */
-Measure_Elixir *MeasureInternalTo_Elixir (Measure *in, int Nvalues) {
-
-  int i;
+Measure_Elixir *MeasureInternalTo_Elixir (Measure *in, off_t Nvalues) {
+
+  off_t i;
   Measure_Elixir *out;
 
@@ -108 +108 @@
 
 /* convert elixir-format averages to internal averages */
-Average *Average_Elixir_ToInternal (Average_Elixir *in, int Nvalues, SecFilt **primary) {
-
-  int i;
+Average *Average_Elixir_ToInternal (Average_Elixir *in, off_t Nvalues, SecFilt **primary) {
+
+  off_t i;
   Average *out;
 
@@ -151 +151 @@
     // changed or added for PS1_V1
     out[i].flags         = in[i].code;   
-    out[i].ChiSq         = 0.0;
+    out[i].ChiSqAve      = NAN;
+    out[i].ChiSqPM       = NAN;
+    out[i].ChiSqPar      = NAN;
+    out[i].Tmean         = 0;
+    out[i].Trange        = 0;
     out[i].Npos          = 0.0;
     out[i].extID         = 0;
@@ -159 +163 @@
 
 /* convert internal averages to elixir-format averages */
-Average_Elixir *AverageInternalTo_Elixir (Average *in, int Nvalues, SecFilt *primary) {
-
-  int i;
+Average_Elixir *AverageInternalTo_Elixir (Average *in, off_t Nvalues, SecFilt *primary) {
+
+  off_t i;
   Average_Elixir *out;
 
@@ -189 +193 @@
 
 /* convert elixir-format secfilts to internal secfilts */
-SecFilt *SecFilt_Elixir_ToInternal (SecFilt_Elixir *in, int Nvalues) {
-
-  int i;
+SecFilt *SecFilt_Elixir_ToInternal (SecFilt_Elixir *in, off_t Nvalues) {
+
+  off_t i;
   SecFilt *out;
 
@@ -208 +212 @@
     out[i].M_20  = 0;      
     out[i].M_80  = 0;      
+
+    // changed or added for PS1_V2
+    out[i].flags = 0;
   }
   return (out);
@@ -213 +220 @@
 
 /* convert internal secfilts to elixir-format secfilts */
-SecFilt_Elixir *SecFiltInternalTo_Elixir (SecFilt *in, int Nvalues) {
-
-  int i;
+SecFilt_Elixir *SecFiltInternalTo_Elixir (SecFilt *in, off_t Nvalues) {
+
+  off_t i;
   SecFilt_Elixir *out;
 
@@ -231 +238 @@
 
 /* convert elixir-format images to internal images */
-Image *Image_Elixir_ToInternal (Image_Elixir *in, int Nvalues) {
-
-  int i;
+Image *Image_Elixir_ToInternal (Image_Elixir *in, off_t Nvalues) {
+
+  off_t i;
   Image *out;
 
@@ -292 +299 @@
     out[i].flags            = in[i].code;
     out[i].parentID         = 0;
+
+    // changed or added for PS1_V2
+    out[i].RAo              = NAN;
+    out[i].DECo             = NAN;
+    out[i].Radius           = NAN;
   }
   return (out);
@@ -297 +309 @@
 
 /* convert internal images to elixir-format images */
-Image_Elixir *ImageInternalTo_Elixir (Image *in, int Nvalues) {
-
-  int i;
+Image_Elixir *ImageInternalTo_Elixir (Image *in, off_t Nvalues) {
+
+  off_t i;
   Image_Elixir *out;
 
@@ -355 +367 @@
 }
 
-PhotCode *PhotCode_Elixir_To_Internal (PhotCode_Elixir *in, int Nvalues) {
-
-  int i;
+PhotCode *PhotCode_Elixir_To_Internal (PhotCode_Elixir *in, off_t Nvalues) {
+
+  off_t i;
   PhotCode *out;
 
@@ -395 +407 @@
 }
 
-PhotCode_Elixir *PhotCode_Internal_To_Elixir (PhotCode *in, int Nvalues) {
-
-  int i;
+PhotCode_Elixir *PhotCode_Internal_To_Elixir (PhotCode *in, off_t Nvalues) {
+
+  off_t i;
   PhotCode_Elixir *out;