Changeset 38421

Timestamp:

Jun 6, 2015, 9:15:09 PM (11 years ago)

Author:

eugene

Message:

load galphot entries; add -update-catcompress; renamed galshape to galphot for convenience (8 chars in NGALPHOT)

Location:

branches/eam_branches/ohana.20150429/src/dvomerge

Files:

• include/dvomerge.h (modified) (1 diff)
• src/LoadCatalog.c (modified) (1 diff)
• src/args.c (modified) (2 diffs)
• src/dvomergeUpdate_catalogs.c (modified) (1 diff)

branches/eam_branches/ohana.20150429/src/dvomerge/include/dvomerge.h

@@ -42 +42 @@
 int    FORCE_MERGE;
 char  *UPDATE_CATFORMAT;
+char  *UPDATE_CATCOMPRESS;
 
 int    MATCHED_TABLES;

branches/eam_branches/ohana.20150429/src/dvomerge/src/LoadCatalog.c

@@ -8 +8 @@
 
     // always load all of the data (if any exists)
-    catalog[0].catflags = DVO_LOAD_AVERAGE | DVO_LOAD_MEASURE | DVO_LOAD_MISSING | DVO_LOAD_SECFILT | DVO_LOAD_LENSING | DVO_LOAD_LENSOBJ | DVO_LOAD_STARPAR;
+    catalog[0].catflags = DVO_LOAD_AVERAGE | DVO_LOAD_MEASURE | DVO_LOAD_MISSING | DVO_LOAD_SECFILT | DVO_LOAD_LENSING | DVO_LOAD_LENSOBJ | DVO_LOAD_STARPAR | DVO_LOAD_GALPHOT;
 
     catalog[0].catformat = dvo_catalog_catformat (CATFORMAT);  // set the default catformat from config data

branches/eam_branches/ohana.20150429/src/dvomerge/src/args.c

@@ -62 +62 @@
     remove_argument (N, argc, argv);
     UPDATE_CATFORMAT = strcreate (argv[N]);
+    remove_argument (N, argc, argv);
+  }
+  UPDATE_CATCOMPRESS = NULL;
+  if ((N = get_argument (*argc, argv, "-update-catcompress"))) {
+    remove_argument (N, argc, argv);
+    UPDATE_CATCOMPRESS = strcreate (argv[N]);
     remove_argument (N, argc, argv);
   }
@@ -212 +218 @@
     remove_argument (N, argc, argv);
   }
+  UPDATE_CATCOMPRESS = NULL;
+  if ((N = get_argument (*argc, argv, "-update-catcompress"))) {
+    remove_argument (N, argc, argv);
+    UPDATE_CATCOMPRESS = strcreate (argv[N]);
+    remove_argument (N, argc, argv);
+  }
 
   /* replace measurement, don't duplicate */

branches/eam_branches/ohana.20150429/src/dvomerge/src/dvomergeUpdate_catalogs.c

@@ -182 +182 @@
           outcatalog.catformat = incatalog.catformat;
         }
+        if (UPDATE_CATCOMPRESS) {
+          outcatalog.catcompress = dvo_catalog_catcompress (UPDATE_CATCOMPRESS);
+        } else {
+          outcatalog.catcompress = incatalog.catcompress;
+        }
       }