Changeset 27839 for branches/simmosaic_branches/Ohana/src/libdvo/src/dvo_convert_loneos.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_loneos.c (modified) (11 diffs)

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

@@ -2 +2 @@
 
 /* convert loneos-format measures to internal measures */
-Measure *Measure_Loneos_ToInternal (Measure_Loneos *in, int Nvalues) {
-
-  int i;
+Measure *Measure_Loneos_ToInternal (Measure_Loneos *in, off_t Nvalues) {
+
+  off_t i;
   Measure *out;
 
@@ -71 +71 @@
 
 /* convert internal measures to loneos-format measures */
-Measure_Loneos *MeasureInternalTo_Loneos (Measure *in, int Nvalues) {
-
-  int i;
+Measure_Loneos *MeasureInternalTo_Loneos (Measure *in, off_t Nvalues) {
+
+  off_t i;
   Measure_Loneos *out;
 
@@ -99 +99 @@
 
 /* convert loneos-format averages to internal averages */
-Average *Average_Loneos_ToInternal (Average_Loneos *in, int Nvalues, SecFilt **primary) {
-
-  int i;
+Average *Average_Loneos_ToInternal (Average_Loneos *in, off_t Nvalues, SecFilt **primary) {
+
+  off_t i;
   Average *out;
 
@@ -143 +143 @@
     // 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;
@@ -151 +155 @@
 
 /* convert internal averages to loneos-format averages */
-Average_Loneos *AverageInternalTo_Loneos (Average *in, int Nvalues, SecFilt *primary) {
-
-  int i;
+Average_Loneos *AverageInternalTo_Loneos (Average *in, off_t Nvalues, SecFilt *primary) {
+
+  off_t i;
   Average_Loneos *out;
 
@@ -180 +184 @@
 
 /* convert loneos-format secfilts to internal secfilts */
-SecFilt *SecFilt_Loneos_ToInternal (SecFilt_Loneos *in, int Nvalues) {
-
-  int i;
+SecFilt *SecFilt_Loneos_ToInternal (SecFilt_Loneos *in, off_t Nvalues) {
+
+  off_t i;
   SecFilt *out;
 
@@ -201 +205 @@
     out[i].M_20  = 0;      
     out[i].M_80  = 0;      
+
+    // changed or added for PS1_V2
+    out[i].flags = 0;
   }
   return (out);
@@ -206 +213 @@
 
 /* convert internal secfilts to loneos-format secfilts */
-SecFilt_Loneos *SecFiltInternalTo_Loneos (SecFilt *in, int Nvalues) {
-
-  int i;
+SecFilt_Loneos *SecFiltInternalTo_Loneos (SecFilt *in, off_t Nvalues) {
+
+  off_t i;
   SecFilt_Loneos *out;
 
@@ -223 +230 @@
 
 /* convert loneos-format images to internal images */
-Image *Image_Loneos_ToInternal (Image_Loneos *in, int Nvalues) {
-
-  int i;
+Image *Image_Loneos_ToInternal (Image_Loneos *in, off_t Nvalues) {
+
+  off_t i;
   Image *out;
 
@@ -285 +292 @@
     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);
@@ -290 +302 @@
 
 /* convert internal images to loneos-format images */
-Image_Loneos *ImageInternalTo_Loneos (Image *in, int Nvalues) {
-
-  int i;
+Image_Loneos *ImageInternalTo_Loneos (Image *in, off_t Nvalues) {
+
+  off_t i;
   Image_Loneos *out;