Changeset 28184 for trunk

Timestamp:

Jun 1, 2010, 4:40:37 PM (16 years ago)

Author:

eugene

Message:

add feature to find high-speed proper-motion objects

Location:

trunk/Ohana/src/relastro

Files:

• Makefile (modified) (1 diff)
• doc/high-speed.txt (added)
• include/relastro.h (modified) (4 diffs)
• src/args.c (modified) (3 diffs)
• src/high_speed_catalogs.c (added)
• src/high_speed_objects.c (added)
• src/initialize.c (modified) (1 diff)
• src/relastro.c (modified) (1 diff)

trunk/Ohana/src/relastro/Makefile

@@ -56 +56 @@
 $(SRC)/save_catalogs.$(ARCH).o       \
 $(SRC)/write_coords.$(ARCH).o        \
-$(SRC)/CoordOps.$(ARCH).o        \
-$(SRC)/FixProblemImages.$(ARCH).o        \
+$(SRC)/CoordOps.$(ARCH).o            \
+$(SRC)/FixProblemImages.$(ARCH).o    \
+$(SRC)/high_speed_catalogs.$(ARCH).o  \
+$(SRC)/high_speed_objects.$(ARCH).o  \
 $(SRC)/relastroVisual.$(ARCH).o
 

trunk/Ohana/src/relastro/include/relastro.h

@@ -14 +14 @@
 typedef enum {FIT_NONE, FIT_AVERAGE, FIT_PM_ONLY, FIT_PAR_ONLY, FIT_PM_AND_PAR} FitMode;
 
-typedef enum {TARGET_NONE, TARGET_OBJECTS, TARGET_SIMPLE, TARGET_CHIPS, TARGET_MOSAICS} FitTarget;
+typedef enum {TARGET_NONE, TARGET_OBJECTS, TARGET_SIMPLE, TARGET_CHIPS, TARGET_MOSAICS, TARGET_HIGH_SPEED} FitTarget;
 
 typedef struct {
@@ -89 +89 @@
 int SRC_MEAS_TOOFEW; //catalog objects wich fewer detections then this are ignored
 double MIN_ERROR;
+
+double RADIUS; // match radius for high-speed objects
 
 int    VERBOSE;
@@ -112 +114 @@
 int           NphotcodesKeep,      NphotcodesSkip;
 PhotCode     **photcodesKeep,     **photcodesSkip;
+
+char          *PHOTCODE_A_LIST,  *PHOTCODE_B_LIST;
+int           NphotcodesGroupA,  NphotcodesGroupB;
+PhotCode     **photcodesGroupA, **photcodesGroupB;
 
 int AreaSelect;
@@ -321 +327 @@
 int saveCoords (Coords *coords, off_t N);
 void resetImageRaw (Catalog *catalog, int Ncatalog, off_t im);
+
+int high_speed_catalogs ();
+int high_speed_objects (SkyRegion *region, Catalog *catalog);
+int MeasMatchesPhotcode(Measure *measure, PhotCode **photcodeSet, int Nset);

trunk/Ohana/src/relastro/src/args.c

@@ -28 +28 @@
     }
   }
+  if ((N = get_argument (argc, argv, "-high-speed"))) {
+    // XXX include a parallax / no-parallax option
+    if (N >= argc - 3) usage();
+    FIT_TARGET = TARGET_HIGH_SPEED;
+    remove_argument (N, &argc, argv);
+    PHOTCODE_A_LIST = strcreate(argv[N]);
+    remove_argument (N, &argc, argv);
+    PHOTCODE_B_LIST = strcreate(argv[N]);
+    remove_argument (N, &argc, argv);
+    RADIUS = atof(argv[N]);
+    remove_argument (N, &argc, argv);
+  }
+
   if ((N = get_argument (argc, argv, "-update-simple"))) {
     remove_argument (N, &argc, argv);
@@ -271 +284 @@
 void usage () {
   fprintf (stderr, "ERROR: USAGE: relastro -region RA RA DEC DEC\n");
-  fprintf (stderr, "       OR:    relastro -catalog (ra) (dec)\n");
-  fprintf (stderr, "  working options: \n");
+  fprintf (stderr, "       OR:    relastro -catalog (ra) (dec)\n\n");
+  fprintf (stderr, "  specify one of the following modes: \n");
   fprintf (stderr, "  -update-objects\n");
   fprintf (stderr, "    -pm\n");
@@ -280 +293 @@
   fprintf (stderr, "  -update-chips\n");
   fprintf (stderr, "  -update-mosaics\n");
+  fprintf (stderr, "  -high-speed (code[,code,code]) (code[,code,code]) (radius)\n\n");
+  fprintf (stderr, "  additional options: \n");
   fprintf (stderr, "  -time (start)(stop)\n");
   fprintf (stderr, "  +photcode (code)[,code,code...]\n");

trunk/Ohana/src/relastro/src/initialize.c

@@ -56 +56 @@
   }
 
+  NphotcodesGroupA = 0;
+  photcodesGroupA = NULL;
+  if (PHOTCODE_A_LIST != NULL) {
+    NPHOTCODES = 10;
+    ALLOCATE (photcodesGroupA, PhotCode *, NPHOTCODES);
+
+    /* parse the comma-separated list of photcodesGroupA */
+    list = PHOTCODE_A_LIST;
+    while ((codename = strtok_r (list, ",", &ptr)) != NULL) {
+      list = NULL; // pass NULL on successive strtok_r calls
+      fprintf (stderr, "PHOTCODE_A_LIST: %s\n", PHOTCODE_A_LIST);
+      fprintf (stderr, "codename: %s\n", codename);
+      if ((photcodesGroupA[NphotcodesGroupA] = GetPhotcodebyName (codename)) == NULL) {
+        fprintf (stderr, "ERROR: photcode %s not found in photcode table\n", codename);
+        exit (1);
+      }
+      NphotcodesGroupA ++;
+      CHECK_REALLOCATE (photcodesGroupA, PhotCode *, NPHOTCODES, NphotcodesGroupA, 10);
+    }
+  }
+
+  NphotcodesGroupB = 0;
+  photcodesGroupB = NULL;
+  if (PHOTCODE_B_LIST != NULL) {
+    NPHOTCODES = 10;
+    ALLOCATE (photcodesGroupB, PhotCode *, NPHOTCODES);
+
+    /* parse the comma-separated list of photcodesGroupB */
+    list = PHOTCODE_B_LIST;
+    while ((codename = strtok_r (list, ",", &ptr)) != NULL) {
+      list = NULL; // pass NULL on successive strtok_r calls
+      fprintf (stderr, "PHOTCODE_B_LIST: %s\n", PHOTCODE_B_LIST);
+      fprintf (stderr, "codename: %s\n", codename);
+      if ((photcodesGroupB[NphotcodesGroupB] = GetPhotcodebyName (codename)) == NULL) {
+        fprintf (stderr, "ERROR: photcode %s not found in photcode table\n", codename);
+        exit (1);
+      }
+      NphotcodesGroupB ++;
+      CHECK_REALLOCATE (photcodesGroupB, PhotCode *, NPHOTCODES, NphotcodesGroupB, 10);
+    }
+  }
+
   initstats (STATMODE);
 

trunk/Ohana/src/relastro/src/relastro.c

@@ -23 +23 @@
   if (FIT_TARGET == TARGET_OBJECTS) {
     relastro_objects ();
+    exit (0);
+  }
+
+  /* the object analysis is a separate process iterating over catalogs */
+  if (FIT_TARGET == TARGET_HIGH_SPEED) {
+    high_speed_catalogs ();
     exit (0);
   }