Changeset 40574 for trunk/Ohana/src/dvomerge

Timestamp:

Dec 5, 2018, 11:39:29 AM (8 years ago)

Author:

eugene

Message:

add option to accept motions from incoming dvo database; respect -region in avextract, mextract, avperiodogram

Location:

trunk/Ohana/src/dvomerge/src

Files:

• Shutdown.c (modified) (1 diff)
• args.c (modified) (2 diffs)
• merge_catalogs_old.c (modified) (1 diff)

trunk/Ohana/src/dvomerge/src/Shutdown.c

@@ -4 +4 @@
 int Shutdown (char *format, ...) {  
   va_list argp;
-  char *formatplus;
+  char formatplus[1024];
   
-  ALLOCATE (formatplus, char, strlen(format) + 2);
-  strcpy (formatplus, format);
-  strcat (formatplus, "\n");
+  snprintf (formatplus, 1024, "%s\n", format);
 
   va_start (argp, format);
   vfprintf (stderr, formatplus, argp);
-  free (formatplus);
   va_end (argp);
 

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

@@ -112 +112 @@
     remove_argument (N, argc, argv);
     ACCEPT_MOTION = TRUE;
-    remove_argument (N, argc, argv);
   }
 
@@ -330 +329 @@
     remove_argument (N, argc, argv);
     ACCEPT_MOTION = TRUE;
-    remove_argument (N, argc, argv);
   }
 

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

@@ -386 +386 @@
     // we can choose to accept the proper-motion and parallax from the reference tgtcat
     if (ACCEPT_MOTION) {
-      output[0].average[Nave].dR         = input[0].average[N].dR;
-      output[0].average[Nave].dD         = input[0].average[N].dD;
-      output[0].average[Nave].uR         = input[0].average[N].uR;
-      output[0].average[Nave].uD         = input[0].average[N].uD;
-      output[0].average[Nave].duR        = input[0].average[N].duR;
-      output[0].average[Nave].duD        = input[0].average[N].duD;
-      output[0].average[Nave].P          = input[0].average[N].P;
-      output[0].average[Nave].dP         = input[0].average[N].dP;
-      output[0].average[Nave].Tmean      = input[0].average[N].Tmean;
+      output[0].average[n].dR         = input[0].average[N].dR;
+      output[0].average[n].dD         = input[0].average[N].dD;
+      output[0].average[n].uR         = input[0].average[N].uR;
+      output[0].average[n].uD         = input[0].average[N].uD;
+      output[0].average[n].duR        = input[0].average[N].duR;
+      output[0].average[n].duD        = input[0].average[N].duD;
+      output[0].average[n].P          = input[0].average[N].P;
+      output[0].average[n].dP         = input[0].average[N].dP;
+      output[0].average[n].Tmean      = input[0].average[N].Tmean;
     }