Changeset 37038 for trunk/Ohana/src/relastro/src/UpdateObjects.c

Timestamp:

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

Author:

eugene

Message:

lots of changes to replace measure.dR,dD with measure.R.D; updates to handle stack vs mean; ps1_v5 changes required

File:

• trunk/Ohana/src/relastro/src/UpdateObjects.c (modified) (8 diffs)

trunk/Ohana/src/relastro/src/UpdateObjects.c

@@ -10 +10 @@
 static double *T;
 static double *dT;
-static double *C;
+static double *C_blue;
+static double *C_red;
 
 void initObjectData (Catalog *catalog, int Ncatalog) {
@@ -38 +39 @@
   ALLOCATE (pY, double, MAX (1, Nmax));
 
-  ALLOCATE (C, double, MAX (1, Nmax));
+  ALLOCATE (C_blue, double, MAX (1, Nmax));
+  ALLOCATE (C_red,  double, MAX (1, Nmax));
 }  
 
@@ -58 +60 @@
   free (pY);
 
-  free (C);
+  free (C_blue);
+  free (C_red);
 }  
 
@@ -66 +69 @@
 
   off_t j, k, m;
-  int i, N, Nc, Nsecfilt, mode, result, status, XVERB;
+  int i, N, NcBlue, NcRed, Nsecfilt, mode, result, status, XVERB;
   StatType statsR, statsD;
   Coords coords;
@@ -130 +133 @@
       }
 
-      Nc = 0;
+      NcBlue = 0;
+      NcRed = 0;
       N = 0;
       m = catalog[i].average[j].measureOffset;
@@ -149 +153 @@
           char *date = ohana_sec_to_date (measure[k].t);
           int dbFlagsBig = measureBig ? measureBig[k].dbFlags : 0;
-          fprintf (stderr, OFF_T_FMT" %f %f %s : 0x%08x : 0x%08x\n",  k, measure[k].dR, measure[k].dD, date, measure[k].dbFlags, dbFlagsBig);
+          fprintf (stderr, OFF_T_FMT" %f %f %s : 0x%08x : 0x%08x\n",  k, measure[k].R, measure[k].D, date, measure[k].dbFlags, dbFlagsBig);
           free (date);
         }
@@ -225 +229 @@
 
         if (setRefColor) {
-          float color = getColor (m+k, i);
-          if (!isnan(color)) {
-            C[Nc] = color;
-            Nc++;
+          float colorBlue = getColorBlue (m+k, i);
+          if (!isnan(colorBlue)) {
+            C_blue[NcBlue] = colorBlue;
+            NcBlue++;
+          }
+          float colorRed = getColorRed (m+k, i);
+          if (!isnan(colorRed)) {
+            C_red[NcRed] = colorRed;
+            NcRed++;
           }
         }
@@ -360 +369 @@
 
       if (setRefColor) {
-        dsort (C, Nc);
-        float colorMedian = (Nc > 0) ? C[(int)(0.5*Nc)] : NAN;
-        catalog[i].average[j].refColor = colorMedian;
+        float colorMedian;
+        dsort (C_blue, NcBlue);
+        colorMedian = (NcBlue > 0) ? C_blue[(int)(0.5*NcBlue)] : NAN;
+        catalog[i].average[j].refColorBlue = colorMedian;
+        dsort (C_red, NcRed);
+        colorMedian = (NcRed > 0) ? C_red[(int)(0.5*NcRed)] : NAN;
+        catalog[i].average[j].refColorRed = colorMedian;
       }