Changeset 36574 for branches/eam_branches/ipp-20140206/Ohana/src/relastro/src/relastro.c

Timestamp:

Mar 4, 2014, 5:27:20 PM (12 years ago)

Author:

eugene

Message:

relastro -parallel-regions basically works; now need to test the results

File:

• branches/eam_branches/ipp-20140206/Ohana/src/relastro/src/relastro.c (modified) (1 diff)

branches/eam_branches/ipp-20140206/Ohana/src/relastro/src/relastro.c

@@ -10 +10 @@
   SkyList *skylist = SkyListByPatch (sky, -1, &UserPatch);
 
-  switch (FIT_TARGET) {
-    case TARGET_UPDATE_OBJECTS:
+  switch (RELASTRO_OP) {
+    case OP_UPDATE_OBJECTS:
       /* the object analysis is a separate process iterating over catalogs */
       relastro_objects (skylist, 0, NULL);
       exit (0);
 
-    case TARGET_HIGH_SPEED:
+    case OP_HIGH_SPEED:
       /* high-speed is a 2pt cross-correlation process for linking moving objects (high PM) */
       high_speed_catalogs (sky, skylist, 0, NULL);
       exit (0);
 
-    case TARGET_HPM:
+    case OP_HPM:
       hpm_catalogs (sky, skylist, 0, NULL);
       exit (0);
 
-    case TARGET_MERGE_SOURCE:
+    case OP_MERGE_SOURCE:
       /* a special method to manually merge unlinked detections of sources togther (not parallel) */
       relastro_merge_source (sky);
       exit (0);
 
-    case TARGET_SIMPLE:
-    case TARGET_CHIPS:
-    case TARGET_MOSAICS:
+    case OP_IMAGES:
       relastro_images (skylist);
       exit (0);
 
-    case TARGET_UPDATE_OFFSETS:
+    case OP_UPDATE_OFFSETS:
       // iterate over catalogs to make detection coordinates consistant
       UpdateObjectOffsets (skylist, 0, NULL);
       exit (0);
 
-    case TARGET_PARALLEL_REGIONS:
+    case OP_PARALLEL_REGIONS:
       // run image updates in parallel across multiple remote machines
       relastro_parallel_regions ();
       exit (0);
 
-    case TARGET_PARALLEL_IMAGES:
+    case OP_PARALLEL_IMAGES:
       // operation on the remote machines in the PARALLEL_REGION mode
       relastro_parallel_images ();