Changeset 36486

Timestamp:

Feb 6, 2014, 12:39:38 PM (12 years ago)

Author:

eugene

Message:

be consistent with images ctype (derived from DEC not RA)

Location:

trunk/Ohana/src/dvomerge

Files:

• . (modified) (1 prop)
• src/dvomergeUpdate_catalogs.c (modified) (1 diff)
• src/merge_catalogs_old.c (modified) (1 diff)

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

@@ -248 +248 @@
     if (FORCE_MERGE)         { snprintf (tmpline, DVO_MAX_PATH, "%s -force-merge",     command); strcpy (command, tmpline); }
 
+    // add some config variables:
+    snprintf (tmpline, DVO_MAX_PATH, "%s -D CATMODE %s",    command, CATMODE);   strcpy (command, tmpline);
+    snprintf (tmpline, DVO_MAX_PATH, "%s -D CATFORMAT %s",  command, CATFORMAT); strcpy (command, tmpline);
+    snprintf (tmpline, DVO_MAX_PATH, "%s -D SKY_DEPTH %d",  command, SKY_DEPTH); strcpy (command, tmpline);
+
     fprintf (stderr, "command: %s\n", command);
 

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

@@ -76 +76 @@
   tcoords.pc1_2 = tcoords.pc2_1 = 0.0;
   tcoords.Npolyterms = 1;
-  strcpy (tcoords.ctype, "RA---ARC");
+  strcpy (tcoords.ctype, "DEC--ARC");
 
   if (VERBOSE) fprintf (stderr, "merging %s into %s\n", input[0].filename, output[0].filename);