Changeset 15743 for trunk/Ohana/src/dvosplit

Timestamp:

Dec 5, 2007, 3:29:29 PM (19 years ago)

Author:

eugene

Message:

importing updates from eam_branch_20071130

Location:

trunk/Ohana/src/dvosplit

Files:

• Makefile (added)
• include (added)
• include/dvosplit.h (added)
• src/ConfigInit.c (added)
• src/SetSignals.c (added)
• src/Shutdown.c (added)
• src/args.c (added)
• src/dvosplit.c (modified) (5 diffs)
• src/open_output_catalogs.c (added)
• src/split_averages.c (added)
• src/split_measures.c (added)
• src/split_missings.c (added)

trunk/Ohana/src/dvosplit/src/dvosplit.c

@@ -1 +1 @@
 # include "dvosplit.h"
-# define NROWS 100000 /* ~10MB per row for measures */
 
+// dvosplit (outlevel) [-region Rmin Rmax Dmin Dmax]
 int main (int argc, char **argv) {
 
-  // USAGE: dvosplit (outlevel) [-region RA RA DEC DEC]
+  int i, j, OUT_DEPTH;
+  SkyTable *sky;
+  SkyList *skylist, *outlist;
+  Catalog incatalog, *outcatalogs;
+  AveLinks *avelinks;
+  char filename[256];
 
-  // the output catalog needs to inherit the SKY_DEPTH of the input catalog. 
-  // if the CATDIR/SkyTable.fits is not found, assume the HST layout (old default)
+  SetSignals ();
+  ConfigInit (&argc, argv);
+  args (argc, argv);
+
+  OUT_DEPTH = atoi (argv[1]);
 
   // load the sky table for the existing database
@@ -13 +21 @@
   SkyTableSetFilenames (sky, CATDIR, "cpt");
 
-  // XXX I should just be copying the input sky and setting the output names on that
-  // load the sky table for the existing database, generate output names
-  outsky = SkyTableLoadOptimal (CATDIR, NULL, NULL, SKY_DEPTH_HST, VERBOSE);
-  SkyTableSetFilenames (outsky, OUTDIR, "cpt");
-
   // get the list of populated regions
-  skylist  = SkyListByPatch (sky, -1, &REGION);
+  skylist  = SkyListByPatch (sky, -1, &UserPatch);
   
   for (i = 0; i < skylist[0].Nregions; i++) {
@@ -27 +30 @@
     // if (current level == out level) skip: no action is needed
     if (skylist[0].regions[i][0].depth >= OUT_DEPTH) continue;
-
-    outlist = SkyListByPatch (outsky, OUT_DEPTH, skylist[0].regions[i]);
 
     // set the parameters which guide catalog open/load/create
@@ -42 +43 @@
 
     // skip empty input catalogs
-    if (!incatalog.Nave_disk) {
+    if (!incatalog.Naves_disk) {
       dvo_catalog_unlock (&incatalog);
       dvo_catalog_free (&incatalog);
@@ -48 +49 @@
     }
 
-    outcatalog = SkyTableSubdivide (&incatalog, &Noutcatalog);
+    // change sky.regions[i].depth for these regions
+    outlist = SkyListByPatch (sky, OUT_DEPTH, skylist[0].regions[i]);
 
-    // split out the average entries:
-    incatalog.catflags = LOAD_AVES;
-    Nblocks = incatalog.Nave_disk / NROWS;
-    for (j = 0; j < Nblocks; j++) {
+    outcatalogs = open_output_catalogs (outlist);
 
-      // read up to NROWS at a time
-      dvo_catalog_load_segment (&incatalog, VERBOSE, j*NROWS, NROWS);
+    avelinks = split_averages (&incatalog, outlist, outcatalogs); 
 
-      for (k = 0; k < incatalog.Naverage; k++) {
-        averef = j*NROWS + k;
-        
-        inR  = incatalog.average[k].R;
-        inD = incatalog.average[k].D;
+    split_measures (&incatalog, outlist, outcatalogs, avelinks); 
 
-        // which of the outcatalogs contains this coordinate?
+    // XXX missing entries have to be reconstructed if they are desired
+    // split_missings (&incatalog, outlist, outcatalogs, avelinks); 
 
-        N = -1;
-        for (n = 0; n < Noutcatalog; 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;
+    dvo_catalog_unlock (&incatalog);
 
-        // XXX this probably needs to be Nave_disk so we can have partial saves
-        Nout = outcatalog[Ncat].Naverage;
-        outref[averef] = Nout;
-        outcat[averef] = Ncat;
-
-        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_unlock (&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);
-      }
+    // adjust depth
+    skylist[0].regions[i][0].table = FALSE;
+    for (j = 0; j < outlist[0].Nregions; j++) {
+      outlist[0].regions[j][0].table = TRUE;
     }
 
-    // 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);
+  // save sky table copy
+  sprintf (filename, "%s/SkyTable.fits", CATDIR);
+  check_file_access (filename, FALSE, VERBOSE);
+  if (!SkyTableSave (sky, filename)) {
+    fprintf (stderr, "ERROR: failed to save sky table for %s\n", CATDIR);
+    exit (1);
+  }
 
-      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);
+}