Changeset 34041 for branches/meh_branches/ppstack_test/Ohana/src/addstar/src/addstar.c

Timestamp:

Jun 19, 2012, 5:24:19 PM (14 years ago)

Author:

mhuber

Message:

merging latest r34040 trunk changes to branch

Location:

branches/meh_branches/ppstack_test

Files:

• . (modified) (1 prop)
• Ohana/src/addstar/src/addstar.c (modified) (8 diffs)

branches/meh_branches/ppstack_test/Ohana/src/addstar/src/addstar.c

@@ -34 +34 @@
   SkyTableSetFilenames (sky, CATDIR, "cpt");
   
-  if (options.mode == M_RESORT) {
+  if (options.mode == ADDSTAR_MODE_RESORT) {
     if (NTHREADS == 0) {
-      resort_unthreaded (&options, sky);
+      resort_unthreaded (&options, sky, 0, NULL);
     } else {
       resort_threaded (&options, sky);
@@ -47 +47 @@
   /*** load in the new data (images, stars) ***/
   switch (options.mode) {
-    case M_IMAGE:
+    case ADDSTAR_MODE_IMAGE:
       stars = LoadStars (argv[1], &Nstars, &images, &Nimages, &options);
 
@@ -62 +62 @@
       ImageOptions (&options, images, Nimages);
       break;
-    case M_REFLIST:
+    case ADDSTAR_MODE_REFLIST:
       stars = grefstars (argv[1], options.photcode, &Nstars);
       skylist = SkyListForStars (sky, -1, stars, Nstars);
       break;
-    case M_RESORT:
-    case M_REFCAT:
+    case ADDSTAR_MODE_RESORT:
+    case ADDSTAR_MODE_REFCAT:
       skylist = SkyListByPatch (sky, -1, &UserPatch);
       break;
-    case M_FAKEIMAGE:
+    case ADDSTAR_MODE_FAKEIMAGE:
       images = fakeimage (argv[1], &Nimages, options.photcode);
       ALLOCATE (skylist, SkyList, 1);
@@ -137 +137 @@
 
     switch (options.mode) {
-      case M_IMAGE:
+      case ADDSTAR_MODE_IMAGE:
         Nsubset = Nstars;
         if (options.closest) {
@@ -145 +145 @@
         }
         break;
-      case M_REFCAT:
+      case ADDSTAR_MODE_REFCAT:
         stars = greference (argv[1], skylist[0].regions[i], options.photcode, &Nstars);
-      case M_REFLIST:
+      case ADDSTAR_MODE_REFLIST:
         subset = find_subset (skylist[0].regions[i], stars, Nstars, &Nsubset);
         if (options.closest) {
@@ -156 +156 @@
         if (Nsubset) free (subset);
         break;
-      case M_RESORT:
+      case ADDSTAR_MODE_RESORT:
         if (options.nosort == 3) catalog.sorted = FALSE;
 
@@ -192 +192 @@
     dvo_catalog_free (&catalog);
 
-    if (options.mode == M_REFCAT) free (stars);
+    if (options.mode == ADDSTAR_MODE_REFCAT) free (stars);
   }
 
@@ -216 +216 @@
 
   /* add the new images and save */
-  if (options.mode == M_IMAGE) {
+  if (options.mode == ADDSTAR_MODE_IMAGE) {
     dvo_image_addrows (&db, images, Nimages);
     SetProtect (TRUE);