Changeset 40874 for trunk/Ohana

Timestamp:

Aug 19, 2019, 4:16:17 PM (7 years ago)

Author:

eugene

Message:

add features to skip unneeded measurement-like elements

Location:

trunk/Ohana/src/photdbc

Files:

• include/photdbc.h (modified) (1 diff)
• src/args.c (modified) (2 diffs)
• src/make_subcatalog.c (modified) (1 diff)
• src/photdbc_catalogs.c (modified) (1 diff)

trunk/Ohana/src/photdbc/include/photdbc.h

@@ -44 +44 @@
 int    SKIP_IMAGES;
 int    ONLY_IMAGES;
+
+int    SKIP_MEASURE;
+int    SKIP_MISSING;
+int    SKIP_LENSING;
+int    SKIP_LENSOBJ;
+int    SKIP_STARPAR;
+int    SKIP_GALPHOT;
+
 int    SHOW_PARAMS;
 int    VERBOSE;

trunk/Ohana/src/photdbc/src/args.c

@@ -29 +29 @@
     }
     ONLY_IMAGES = TRUE;
+    remove_argument (N, &argc, argv);
+  }
+
+  /** allow only certain tables to be copied **/ 
+  SKIP_MEASURE = FALSE;
+  if ((N = get_argument (argc, argv, "-skip-measure"))) {
+    SKIP_MEASURE = TRUE;
+    remove_argument (N, &argc, argv);
+  }
+  SKIP_MISSING = FALSE;
+  if ((N = get_argument (argc, argv, "-skip-missing"))) {
+    SKIP_MISSING = TRUE;
+    remove_argument (N, &argc, argv);
+  }
+  SKIP_LENSING = FALSE;
+  if ((N = get_argument (argc, argv, "-skip-lensing"))) {
+    SKIP_LENSING = TRUE;
+    remove_argument (N, &argc, argv);
+  }
+  SKIP_LENSOBJ = FALSE;
+  if ((N = get_argument (argc, argv, "-skip-lensobj"))) {
+    SKIP_LENSOBJ = TRUE;
+    remove_argument (N, &argc, argv);
+  }
+  SKIP_STARPAR = FALSE;
+  if ((N = get_argument (argc, argv, "-skip-starpar"))) {
+    SKIP_STARPAR = TRUE;
+    remove_argument (N, &argc, argv);
+  }
+  SKIP_GALPHOT = FALSE;
+  if ((N = get_argument (argc, argv, "-skip-galphot"))) {
+    SKIP_GALPHOT = TRUE;
     remove_argument (N, &argc, argv);
   }
@@ -246 +278 @@
     remove_argument (N, &argc, argv);
     MAX_MIN_MAG = atof(argv[N]);
+    remove_argument (N, &argc, argv);
+  }
+
+  /** allow only certain tables to be copied **/ 
+  SKIP_MEASURE = FALSE;
+  if ((N = get_argument (argc, argv, "-skip-measure"))) {
+    SKIP_MEASURE = TRUE;
+    remove_argument (N, &argc, argv);
+  }
+  SKIP_MISSING = FALSE;
+  if ((N = get_argument (argc, argv, "-skip-missing"))) {
+    SKIP_MISSING = TRUE;
+    remove_argument (N, &argc, argv);
+  }
+  SKIP_LENSING = FALSE;
+  if ((N = get_argument (argc, argv, "-skip-lensing"))) {
+    SKIP_LENSING = TRUE;
+    remove_argument (N, &argc, argv);
+  }
+  SKIP_LENSOBJ = FALSE;
+  if ((N = get_argument (argc, argv, "-skip-lensobj"))) {
+    SKIP_LENSOBJ = TRUE;
+    remove_argument (N, &argc, argv);
+  }
+  SKIP_STARPAR = FALSE;
+  if ((N = get_argument (argc, argv, "-skip-starpar"))) {
+    SKIP_STARPAR = TRUE;
+    remove_argument (N, &argc, argv);
+  }
+  SKIP_GALPHOT = FALSE;
+  if ((N = get_argument (argc, argv, "-skip-galphot"))) {
+    SKIP_GALPHOT = TRUE;
     remove_argument (N, &argc, argv);
   }

trunk/Ohana/src/photdbc/src/make_subcatalog.c

@@ -1 +1 @@
 # include "photdbc.h"
-
-# define SKIP_MEASURE FALSE
-# define SKIP_LENSING FALSE
-# define SKIP_LENSOBJ FALSE
-# define SKIP_STARPAR FALSE
-# define SKIP_GALPHOT FALSE
 
 // copy a catalog to a new subcatalog, applying some filters

trunk/Ohana/src/photdbc/src/photdbc_catalogs.c

@@ -152 +152 @@
     if (CATMODE)            { strextend (&command, "-set-mode %s", CATMODE); }
 
+    if (SKIP_MEASURE)       { strextend (&command, "-skip-measure"); }
+    if (SKIP_MISSING)       { strextend (&command, "-skip-missing"); }
+    if (SKIP_LENSING)       { strextend (&command, "-skip-lensing"); }
+    if (SKIP_LENSOBJ)       { strextend (&command, "-skip-lensobj"); }
+    if (SKIP_GALPHOT)       { strextend (&command, "-skip-galphot"); }
+    if (SKIP_STARPAR)       { strextend (&command, "-skip-starpar"); }
+
     if (PARALLEL_OUTHOSTS) {
       tmppath = abspath (table_output->hosts[i].pathname, DVO_MAX_PATH);