Changeset 15729

Timestamp:

Dec 1, 2007, 4:31:07 PM (18 years ago)

Author:

eugene

Message:

cleaning up code org

Location:

branches/eam_branch_20071130/Ohana/src/dvosplit/src

Files:

• dvosplit.c (modified) (3 diffs)
• open_output_catalogs.c (added)
• split_averages.c (added)
• split_measures.c (added)
• split_missings.c (added)

branches/eam_branch_20071130/Ohana/src/dvosplit/src/dvosplit.c

@@ -1 +1 @@
 # include "dvosplit.h"
-# define NROWS 100000 /* ~10MB per row for measures */
 
 int main (int argc, char **argv) {
@@ -31 +30 @@
     // XXX : we need to copy these files to their new names
 
-    // change outsky.regions[i].depth for these regions
-    outlist = SkyListByPatch (outsky, OUT_DEPTH, skylist[0].regions[i]);
-
     // set the parameters which guide catalog open/load/create
     incatalog.filename = skylist[0].filename[i];
@@ -52 +48 @@
     }
 
-    // split out the average entries:
-    incatalog.catflags = LOAD_AVES;
-    Nblocks = incatalog.Nave_disk / NROWS;
-    for (j = 0; j < Nblocks; j++) {
+    // change outsky.regions[i].depth for these regions
+    outlist = SkyListByPatch (outsky, OUT_DEPTH, skylist[0].regions[i]);
 
-      // read up to NROWS at a time
-      dvo_catalog_load_segment (&incatalog, VERBOSE, j*NROWS, NROWS);
+    outcatalogs = open_output_catalogs (outlist);
 
-      for (k = 0; k < incatalog.Naverage; k++) {
-        averef = j*NROWS + k;
-        
-        inR  = incatalog.average[k].R;
-        inD = incatalog.average[k].D;
+    avelinks = split_averages (&incatalog, outlist, outcatalogs); 
 
-        // which of the outcatalogs contains this coordinate?
+    split_measures (&incatalog, outlist, outcatalogs, avelinks); 
 
-        N = -1;
-        for (n = 0; n < outlist[0].Nregions; n++) {
-          if (inR < outregions[n].Rmin) continue;
-          if (inR > outregions[n].Rmax) continue;
-          if (inD < outregions[n].Dmin) continue;
-          if (inD > outregions[n].Dmax) continue;
-          Ncat = n;
-          break;
-        }
-        if (Ncat == -1) continue;
+    // XXX missing entries have to be reconstructed if they are desired
+    // split_missings (&incatalog, outlist, outcatalogs, avelinks); 
 
-        // XXX this probably needs to be Nave_disk so we can have partial saves
-        Nout = outcatalog[Ncat].Naverage;
-        outref[averef] = Nout;
-        outcat[averef] = Ncat;
+    dvo_catalog_close (&incatalog);
 
-        outcatalog[Ncat].average[Nout] = incatalog.average[k];
-        outcatalog[Ncat].Naverage++;
-      }
-
-      for (n = 0; n < Noutcatalog; n++) {
-        dvo_catalog_save_segment (&outcatalog[Ncat], VERBOSE, outcatalog[Ncat].Nave_disk, outcatalog[Ncat].Naverage);
-      }
+    for (j = 0; j < outlist[0].Nregions; j++) {
+      dvo_catalog_close (&outcatalogs[j]);
     }
-
-    // split out the measure entries:
-    incatalog.catflags = LOAD_MEAS;
-    Nblocks = incatalog.Nmeas_disk / NROWS;
-    for (j = 0; j < Nblocks; j++) {
-
-      // read up to NROWS at a time
-      dvo_catalog_load_segment (&incatalog, VERBOSE, j*NROWS, NROWS);
-
-      for (k = 0; k < incatalog.Nmeasure; k++) {
-
-        averef = incatalog.measure[k].averef;
-        Ncat = outcat[averef];
-
-        Nout = outcatalog[Ncat].Nmeasure;
-        outcatalog[Ncat].measure[Nout] = incatalog.measure[k];
-        outcatalog[Ncat].measure[Nout].averef = outref[averef];
-        outcatalog[Ncat].Nmeasure++;
-      }
-
-      for (n = 0; n < Noutcatalog; n++) {
-        dvo_catalog_save_segment (&outcatalog[N], VERBOSE, outcatalog[N].Nmeas_disk, outcatalog[N].Nmeasure);
-      }
-    }
-
-    // split out the secfilt entries:
-    incatalog.catflags = LOAD_SECF;
-    Nblocks = incatalog.Nsecfilt_disk / NROWS;
-    for (j = 0; j < Nblocks; j++) {
-
-      // read up to NROWS at a time
-      dvo_catalog_load_segment (&incatalog, VERBOSE, j*NROWS, NROWS);
-
-      for (k = 0; k < incatalog.Naverage; k++) {
-
-        averef = j*NROWS + k;
-        Ncat = outcat[averef];
-        Nout = outref[averef] * Nsecfilt;
-
-        for (n = 0; n < Nsecfilt; n++) {
-          outcatalog[Ncat].secfilt[Nout + n] = incatalog.measure[k*Nsecfilt + n];
-        }
-      }
-
-      for (n = 0; n < Noutcatalog; n++) {
-        dvo_catalog_save_segment (&outcatalog[N], VERBOSE, outcatalog[N].Nmeas_disk, outcatalog[N].Nmeasure);
-      }
-    }
-
+  }
+  exit (0);
+}