Changeset 36935

Timestamp:

Jun 22, 2014, 5:21:42 PM (12 years ago)

Author:

eugene

Message:

fix dvosplit for ps1_v5 changes, not really tested

Location:

branches/eam_branches/ipp-20140610/Ohana/src/dvosplit/src

Files:

• dvosplit.c (modified) (1 diff)
• split_averages.c (modified) (1 diff)
• split_measures.c (modified) (2 diffs)

branches/eam_branches/ipp-20140610/Ohana/src/dvosplit/src/dvosplit.c

@@ -17 +17 @@
   args (argc, argv);
 
-  fprintf (stderr, "this program has the ability to split dvo catalogs one file (cpt, cpm, etc) at a time.  however, new updates to the cpm format requires the average RA,DEC coords to load the measures.  update the code to handle that first");
+  /*
+  fprintf (stderr, 
+  "this program has the ability to split dvo catalogs one file (cpt, cpm, etc) at a time.
+  however, new updates to the cpm format requires the average RA,DEC coords to load the
+  measures.  update the code to handle that first");
   exit (2);
+  */
 
   CATDIR = strcreate (argv[1]);

branches/eam_branches/ipp-20140610/Ohana/src/dvosplit/src/split_averages.c

@@ -1 +1 @@
 # include "dvosplit.h"
-# define NROWS 100000 /* ~10MB per block for measures */
+# define NROWS 1000000 /* ~10MB per block for measures */
 # define DNOUT 1000
 

branches/eam_branches/ipp-20140610/Ohana/src/dvosplit/src/split_measures.c

@@ -1 +1 @@
 # include "dvosplit.h"
-# define NROWS 100000 /* ~10MB per row for measures */
+# define NROWS 1000000 /* ~10MB per row for measures */
 # define DNOUT 1000
 
@@ -19 +19 @@
 
   // split out the measure entries:
-  incatalog[0].catflags = LOAD_MEAS;
+  incatalog[0].catflags = LOAD_MEAS | LOAD_AVES | LOAD_SECF;
+
   // if ((incatalog[0].catformat == DVO_FORMAT_ELIXIR) || (incatalog[0].catformat == DVO_FORMAT_LONEOS)) {
   //   // for these two formats, we need the average and secfilt values around until we do the measures...