Changeset 6763

Timestamp:

Apr 4, 2006, 8:58:12 AM (20 years ago)

Author:

eugene

Message:

added fake image mode

Location:

trunk/Ohana/src/addstar

Files:

• Makefile (modified) (1 diff)
• doc/notes.txt (modified) (1 diff)
• include/addstar.h (modified) (4 diffs)
• src/ConfigInit.c (modified) (1 diff)
• src/addstar.c (modified) (3 diffs)
• src/args.c (modified) (2 diffs)
• src/fakeimage.c (added)

trunk/Ohana/src/addstar/Makefile

@@ -35 +35 @@
 $(SRC)/find_matches_refstars.$(ARCH).o \
 $(SRC)/find_subset.$(ARCH).o \
+$(SRC)/fakeimage.$(ARCH).o \
 $(SRC)/gcatalog.$(ARCH).o \
 $(SRC)/get2mass.$(ARCH).o \

trunk/Ohana/src/addstar/doc/notes.txt

@@ +1 @@
+
+2006.04.02
+
+  I am considering an option to insert fake camera images into the
+  database.  The camera would be described with a file specifying the
+  dimensions of each chip (Nx,Ny,pixel scale), the location of each
+  chip in the focal plane, and the optical parameters of the camera
+  (plate scale at center, x,y distortion terms).  Each call to addstar
+  would specify the boresite center:
+
+  addstar -fakeimage ra dec theta
+
+  the camera parameters should be loaded via the config information.
 
 2005.10.24

trunk/Ohana/src/addstar/include/addstar.h

@@ -33 +33 @@
 typedef struct sockaddr_in SockAddress;
 
-enum {M_IMAGE, M_REFLIST, M_REFCAT};
+enum {M_IMAGE, M_REFLIST, M_REFCAT, M_FAKEIMAGE};
 
 /* global which define database info / data sources (KEEP) */
@@ -53 +53 @@
 char   SKY_TABLE[256];
 int    SKY_DEPTH;  /** XXX EAM : depth of catalog tables, fix usage */
+char   CameraLayout[256];
 SkyTable *ServerSky;
 
@@ -81 +82 @@
 double  Latitude;       // carried into image structure from config
 Coords *MOSAIC;         // carries the mosaic into gstars
+double  FAKE_RA;        // boresite coords for fake images
+double  FAKE_DEC;       // boresite coords for fake images
+double  FAKE_THETA;     // boresite angle for fake images
 
 /* these globals are used separately by both client and server (KEEP) */
@@ -118 +122 @@
 int        dump_rawstars          PROTO((Stars *stars, int Nstars));
 int        edge_check             PROTO((double *x1, double *y1, double *x2, double *y2));
+Image     *fakeimage              PROTO((char *rootname, int *Nimage, int photcode));
 void       find_matches           PROTO((SkyRegion *region, Stars *stars, int Nstars, Catalog *catalog, Image *image, Image *overlap, int Noverlap, Coords *mosaic, AddstarClientOptions options));
 void       find_matches_closest   PROTO((SkyRegion *region, Stars *stars, int Nstars, Catalog *catalog, Image *image, Image *overlap, int Noverlap, Coords *mosaic, AddstarClientOptions options));

trunk/Ohana/src/addstar/src/ConfigInit.c

@@ -75 +75 @@
   /* dropped: ScanConfig (config, "IMAGE_CATALOG",          "%s",  0, ImageCat); */
 
+  ScanConfig (config, "CAMERA_LAYOUT",          "%s",  0, CameraLayout);
 
   /* used by client/server setup */

trunk/Ohana/src/addstar/src/addstar.c

@@ -4 +4 @@
 
   int Nm, Na, Ns, status;
-  int i, Nstars, Noverlap, Nsubset, Naverage, Nmeasure;
+  int i, Nstars, Nimage, Noverlap, Nsubset, Naverage, Nmeasure;
   Stars *stars, **subset;
-  Image image, *overlap;
+  Image image, *imageSet, *overlap;
   Catalog catalog;
   FITS_DB db;
@@ -54 +54 @@
       skylist = SkyListByPatch (sky, -1, &UserPatch);
       break;
+    case M_FAKEIMAGE:
+      imageSet = fakeimage (argv[1], &Nimage, options.photcode);
+      RegisterMosaic (MOSAIC);
+
+      if (db.dbstate == LCK_EMPTY) {
+        create_image_db (&db);
+      } else {
+        if (!dvo_image_load (&db, VERBOSE, FORCE_READ)) {
+          Shutdown ("can't read image catalog %s", db.filename);
+        }
+      }   
+
+      dvo_image_addrows (&db, imageSet, Nimage);
+      SetProtect (TRUE);
+      dvo_image_update (&db, VERBOSE);
+      SetProtect (FALSE);
+
+      ohana_memcheck (FALSE);
+      dvo_image_unlock (&db); /* unlock? */
+
+      gettimeofday (&stop, NULL);
+      dtime = DTIME (stop, start);
+      fprintf (stderr, "SUCCESS: elapsed time %9.4f sec for fake image\n", dtime);
+      exit (0);
   }
   if (options.only_match || options.existing_regions) {
@@ -63 +87 @@
   if (VERBOSE) fprintf (stderr, "writing to %d regions\n", skylist[0].Nregions);
 
+  /* XXX clean this up a bit : for only_image, I don't need to do this loop
+     unless we are getting the calibration. */
   Naverage = Nmeasure = 0;
   for (i = 0; i < skylist[0].Nregions; i++) {

trunk/Ohana/src/addstar/src/args.c

@@ -23 +23 @@
   if ((N = get_argument (argc, argv, "-cat"))) {
     options.mode = M_REFCAT;
+    remove_argument (N, &argc, argv);
+  }
+  if ((N = get_argument (argc, argv, "-fakeimage"))) {
+    options.mode = M_FAKEIMAGE;
+    remove_argument (N, &argc, argv);
+    FAKE_RA = atof (argv[N]);
+    remove_argument (N, &argc, argv);
+    FAKE_DEC = atof (argv[N]);
+    remove_argument (N, &argc, argv);
+    FAKE_THETA = atof (argv[N]);
     remove_argument (N, &argc, argv);
   }
@@ -241 +251 @@
     fprintf (stderr, "USAGE: addstar -cat (catalog)\n");
     fprintf (stderr, "USAGE: addstar -ref (filename)\n");
+    fprintf (stderr, "USAGE: addstar -fakeimage (ra) (dec) (theta) (name)\n");
     exit (2);
   }