Changeset 41152 for trunk

Timestamp:

Nov 27, 2019, 5:27:20 AM (7 years ago)

Author:

eugene

Message:

added option to accept astrometry from merged source

Location:

trunk/Ohana/src/dvomerge

Files:

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

trunk/Ohana/src/dvomerge/include/dvomerge.h

@@ -31 +31 @@
 int    IMAGES_ONLY;
 int    ACCEPT_MOTION;
+
+int    ACCEPT_ASTROM;
 int    RETAIN_AVE_PHOTOMETRY;
+
 char   CATDIR[DVO_MAX_PATH];
 char   GSCFILE[DVO_MAX_PATH];

trunk/Ohana/src/dvomerge/src/args.c

@@ -112 +112 @@
   }
 
-  /* limit the impact of a dvomerge -parallel */
+  /* accept input database average astrometry motions */
   ACCEPT_MOTION = FALSE;
   if ((N = get_argument (*argc, argv, "-accept-motion"))) {
     remove_argument (N, argc, argv);
     ACCEPT_MOTION = TRUE;
+  }
+  /* accept input database average astrometry information */
+  ACCEPT_ASTROM = FALSE;
+  if ((N = get_argument (*argc, argv, "-accept-astrom"))) {
+    remove_argument (N, argc, argv);
+    ACCEPT_ASTROM = TRUE;
   }
 
@@ -337 +343 @@
   }
 
-  /* limit the impact of a dvomerge -parallel */
+  /* accept input database average astrometry motions */
   ACCEPT_MOTION = FALSE;
   if ((N = get_argument (*argc, argv, "-accept-motion"))) {
     remove_argument (N, argc, argv);
     ACCEPT_MOTION = TRUE;
+  }
+  /* accept input database average astrometry information */
+  ACCEPT_ASTROM = FALSE;
+  if ((N = get_argument (*argc, argv, "-accept-astrom"))) {
+    remove_argument (N, argc, argv);
+    ACCEPT_ASTROM = TRUE;
   }
 

trunk/Ohana/src/dvomerge/src/dvomergeUpdate_catalogs.c

@@ -328 +328 @@
     if (FORCE_MERGE)           { strextend (&command, "-force-merge"); }
     if (ACCEPT_MOTION)         { strextend (&command, "-accept-motion"); }
+    if (ACCEPT_ASTROM)         { strextend (&command, "-accept-astrom"); }
     if (RETAIN_AVE_PHOTOMETRY) { strextend (&command, "-retain-ave-photometry"); }
     if (MATCHED_TABLES)        { strextend (&command, "-matched-tables"); }

trunk/Ohana/src/dvomerge/src/merge_catalogs_old.c

@@ -363 +363 @@
     }
 
+    // XXX: add choice of secfilt
     // update the average properties to reflect the incoming entries:
     // if RETAIN_AVE_PHOTOMETRY is true and the original value is NAN, but the input value is not, accept the input:
@@ -389 +390 @@
 
     // we can choose to accept the proper-motion and parallax from the reference tgtcat
-    if (ACCEPT_MOTION) {
+    if (ACCEPT_MOTION || ACCEPT_ASTROM) {
       output[0].average[n].dR         = input[0].average[N].dR;
       output[0].average[n].dD         = input[0].average[N].dD;
@@ -400 +401 @@
       output[0].average[n].Tmean      = input[0].average[N].Tmean;
     }
+    if (ACCEPT_ASTROM) {
+      output[0].average[n].R          = input[0].average[N].R;
+      output[0].average[n].D          = input[0].average[N].D;
+    }
 
     /* Nm is updated, but not written out in -update mode (for existing entries)
@@ -461 +466 @@
 
     // we can choose to accept the proper-motion and parallax from the reference tgtcat
-    if (ACCEPT_MOTION) {
+    if (ACCEPT_MOTION || ACCEPT_ASTROM) {
       output[0].average[Nave].dR         = input[0].average[N].dR;
       output[0].average[Nave].dD         = input[0].average[N].dD;
@@ -471 +476 @@
       output[0].average[Nave].dP         = input[0].average[N].dP;
       output[0].average[Nave].Tmean      = input[0].average[N].Tmean;
+    }
+    if (ACCEPT_ASTROM) {
+      output[0].average[Nave].R          = input[0].average[N].R;
+      output[0].average[Nave].D          = input[0].average[N].D;
     }