Changeset 15735

Timestamp:

Dec 5, 2007, 11:27:37 AM (18 years ago)

Author:

eugene

Message:

finish basic coding for dvosplit

Location:

branches/eam_branch_20071130/Ohana/src/dvosplit

Files:

• Makefile (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 (modified) (2 diffs)
• src/split_averages.c (modified) (5 diffs)
• src/split_measures.c (modified) (3 diffs)

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

@@ -1 +1 @@
 # include "dvosplit.h"
 
+// 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);
 
-  // force the output to have SPLIT mode?
+  OUT_DEPTH = atoi (argv[1]);
 
   // load the sky table for the existing database
@@ -14 +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++) {
@@ -28 +30 @@
     // if (current level == out level) skip: no action is needed
     if (skylist[0].regions[i][0].depth >= OUT_DEPTH) continue;
-    // XXX : we need to copy these files to their new names
 
     // set the parameters which guide catalog open/load/create
@@ -48 +49 @@
     }
 
-    // change outsky.regions[i].depth for these regions
-    outlist = SkyListByPatch (outsky, OUT_DEPTH, skylist[0].regions[i]);
+    // change sky.regions[i].depth for these regions
+    outlist = SkyListByPatch (sky, OUT_DEPTH, skylist[0].regions[i]);
 
     outcatalogs = open_output_catalogs (outlist);
@@ -60 +61 @@
     // split_missings (&incatalog, outlist, outcatalogs, avelinks); 
 
-    dvo_catalog_close (&incatalog);
+    dvo_catalog_unlock (&incatalog);
 
     for (j = 0; j < outlist[0].Nregions; j++) {
-      dvo_catalog_close (&outcatalogs[j]);
+      dvo_catalog_unlock (&outcatalogs[j]);
     }
+
+    // adjust depth
+    skylist[0].regions[i][0].table = FALSE;
+    for (j = 0; j < outlist[0].Nregions; j++) {
+      outlist[0].regions[j][0].table = TRUE;
+    }
+
   }
+
+  // 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);
+  }
+
   exit (0);
 }

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

@@ -3 +3 @@
 Catalog *open_output_catalogs (SkyList *outlist) {
 
+  int i;
   Catalog *outcatalogs;
 
@@ -11 +12 @@
     
     // set the parameters which guide catalog open/load/create
-    outcatalogs[i].filename = skylist[0].filename[i];
-    outcatalogs[i].Nsecfilt = GetPhotcodeNsecfilt ();
-    outcatalogs[i].catflags = LOAD_NONE;
+    outcatalogs[i].filename  = outlist[0].filename[i];
+    outcatalogs[i].Nsecfilt  = GetPhotcodeNsecfilt ();
+    outcatalogs[i].catflags  = LOAD_NONE;
+    outcatalogs[i].catformat = dvo_catalog_catformat (CATFORMAT);  // set the default catformat from config data
+    outcatalogs[i].catmode   = dvo_catalog_catmode (CATMODE);      // set the default catmode from config data
 
     if (!dvo_catalog_open (&outcatalogs[i], outlist[0].regions[i], VERBOSE, "w")) {

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

@@ -5 +5 @@
 
   double inR, inD;
-  int block, ave, cat, Nblocks, Ncat, Nout;
+  int n, block, ave, cat, averef, Nblocks, Ncat, Nout, Nsecfilt;
   int *outref, *outcat;
   AveLinks *avelinks;
@@ -17 +17 @@
   // contains primary photcodes, which will increase Nsecfilt by one.
   for (cat = 0; cat < outlist[0].Nregions; cat++) {
-    REALLOCATE (outcatalog[cat].average, Average, NROWS);
-    REALLOCATE (outcatalog[cat].secfilt, SecFilt, NROWS*(Nsecfilt + 1));
+    REALLOCATE (outcatalogs[cat].average, Average, NROWS);
+    REALLOCATE (outcatalogs[cat].secfilt, SecFilt, NROWS*(Nsecfilt + 1));
   }
 
@@ -27 +27 @@
 
     // read up to NROWS at a time
-    dvo_catalog_load_segment (&incatalog, VERBOSE, block*NROWS, NROWS);
-    assert (block*NROWS == incatalogs[0].Naves_off);
+    dvo_catalog_load_segment (incatalog, VERBOSE, block*NROWS, NROWS);
+    assert (block*NROWS == incatalog[0].Naves_off);
 
     for (ave = 0; ave < incatalog[0].Naverage; ave++) {
@@ -53 +53 @@
       }
 
-      Nout = outcatalog[Ncat].Naverage;
-      outref[averef] = Nout + outcatalog[Ncat].Naves_off;
+      Nout = outcatalogs[Ncat].Naverage;
+      outref[averef] = Nout + outcatalogs[Ncat].Naves_off;
       outcat[averef] = Ncat;
 
       // assign the value to the next element of the output catalog
-      outcatalog[Ncat].average[Nout] = incatalog[0].average[k];
-      outcatalog[Ncat].Naverage++;
+      outcatalogs[Ncat].average[Nout] = incatalog[0].average[ave];
+      outcatalogs[Ncat].Naverage ++;
 
       // update secfilt at the same time
       for (n = 0; n < Nsecfilt; n++) {
-        outcatalog[Ncat].secfilt[Nout*Nsecfilt + n] = incatalog[0].secfilt[ave*Nsecfilt + n];
-        outcatalog[Ncat].Nsecf_mem++;
+        outcatalogs[Ncat].secfilt[Nout*Nsecfilt + n] = incatalog[0].secfilt[ave*Nsecfilt + n];
+        outcatalogs[Ncat].Nsecf_mem++;
       }
     }
@@ -72 +72 @@
     // write out the new values
     for (cat = 0; cat < outlist[0].Nregions; cat++) {
-      outcatalog[cat].catflags = LOAD_AVES | LOAD_SECF;
-      dvo_catalog_save_segment (&outcatalog[cat], VERBOSE);
+      outcatalogs[cat].catflags = LOAD_AVES | LOAD_SECF;
+      dvo_catalog_save (&outcatalogs[cat], VERBOSE);
 
       // XXX I need to advance the pointers and free the current data
       // XXX these should be done within save segment:
-      outcatalog[cat].Naves_disk += outcatalog[cat].Naverage;
-      outcatalog[cat].Naves_off  += outcatalog[cat].Naverage;
-      outcatalog[cat].Naverage    = 0;
+      outcatalogs[cat].Naves_disk += outcatalogs[cat].Naverage;
+      outcatalogs[cat].Naves_off  += outcatalogs[cat].Naverage;
+      outcatalogs[cat].Naverage    = 0;
 
-      outcatalog[cat].Nsecf_disk += Nsecfilt * outcatalog[cat].Naverage;
-      outcatalog[cat].Nsecf_off  += Nsecfilt * outcatalog[cat].Naverage;
-      outcatalog[cat].Nsecf_mem   = 0;
+      outcatalogs[cat].Nsecf_disk += Nsecfilt * outcatalogs[cat].Naverage;
+      outcatalogs[cat].Nsecf_off  += Nsecfilt * outcatalogs[cat].Naverage;
+      outcatalogs[cat].Nsecf_mem   = 0;
     }
   }

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

@@ -4 +4 @@
 int split_measures (Catalog *incatalog, SkyList *outlist, Catalog *outcatalogs, AveLinks *avelinks) {
 
+  int block, meas, cat, Nblocks, Ncat, Nout, averef;
   int *outref, *outcat;
 
@@ -11 +12 @@
   // allocate enough space for the output buffer
   for (cat = 0; cat < outlist[0].Nregions; cat++) {
-    REALLOCATE (outcatalog[cat].measure, Measure, NROWS);
+    REALLOCATE (outcatalogs[cat].measure, Measure, NROWS);
   }
 
@@ -27 +28 @@
       Ncat = outcat[averef];
 
-      Nout = outcatalog[Ncat].Nmeasure;
-      outcatalog[Ncat].measure[Nout] = incatalog[0].measure[meas];
-      outcatalog[Ncat].measure[Nout].averef = outref[averef];
-      outcatalog[Ncat].Nmeasure++;
+      Nout = outcatalogs[Ncat].Nmeasure;
+      outcatalogs[Ncat].measure[Nout] = incatalog[0].measure[meas];
+      outcatalogs[Ncat].measure[Nout].averef = outref[averef];
+      outcatalogs[Ncat].Nmeasure++;
     }
 
     for (cat = 0; cat < outlist[0].Nregions; cat++) {
       outcatalogs[cat].catflags = LOAD_AVES | LOAD_SECF;
-      dvo_catalog_save_segment (&outcatalog[cat], VERBOSE);
+      dvo_catalog_save (&outcatalogs[cat], VERBOSE);
 
-      outcatalog[cat].Nmeas_disk += outcatalog[cat].Nmeasure;
-      outcatalog[cat].Nmeas_off  += outcatalog[cat].Nmeasure;
-      outcatalog[cat].Nmeasure    = 0;
+      outcatalogs[cat].Nmeas_disk += outcatalogs[cat].Nmeasure;
+      outcatalogs[cat].Nmeas_off  += outcatalogs[cat].Nmeasure;
+      outcatalogs[cat].Nmeasure    = 0;
 
     }