Changeset 40704

Timestamp:

Apr 27, 2019, 5:33:17 AM (7 years ago)

Author:

eugene

Message:

changes to dvomerge to support gaia dr2

Location:

branches/eam_branches/ohana.20190329/src/dvomerge/src

Files:

• args.c (modified) (2 diffs)
• merge_catalogs_old.c (modified) (5 diffs)

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

@@ -112 +112 @@
     remove_argument (N, argc, argv);
     ACCEPT_MOTION = TRUE;
+  }
+
+  /* limit the impact of a dvomerge -parallel */
+  ACCEPT_ASTROM = FALSE;
+  if ((N = get_argument (*argc, argv, "-accept-astrom"))) {
+    remove_argument (N, argc, argv);
+    ACCEPT_ASTROM = TRUE;
   }
 
@@ -330 +337 @@
     ACCEPT_MOTION = TRUE;
   }
+  /* limit the impact of a dvomerge -parallel */
+  ACCEPT_ASTROM = FALSE;
+  if ((N = get_argument (*argc, argv, "-accept-astrom"))) {
+    remove_argument (N, argc, argv);
+    ACCEPT_ASTROM = TRUE;
+  }
 
   /* extra error messages */

branches/eam_branches/ohana.20190329/src/dvomerge/src/merge_catalogs_old.c

@@ -362 +362 @@
     }
 
+  XXX: add choice of secfilt
     // update the average properties to reflect the incoming entries:
     // if the original value is NAN but the input value is not, accept the input:
@@ -385 +386 @@
 
     // 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;
@@ -396 +397 @@
       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)
@@ -457 +462 @@
 
     // 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;
@@ -467 +472 @@
       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;
     }