Changeset 35263 for trunk/Ohana/src/addstar

Timestamp:

Mar 7, 2013, 9:51:07 AM (13 years ago)

Author:

eugene

Message:

merge changes from eam_branches/ipp-20130306: addstar now can block against duplicate image IDs; mextract, mmatch now use a subset of image metadata instead of the whole table

Location:

trunk/Ohana

Files:

• . (modified) (1 prop)
• src/addstar/Makefile (modified) (2 diffs)
• src/addstar/include/addstar.h (modified) (2 diffs)
• src/addstar/src/ImageIndex.c (copied) (copied from branches/eam_branches/ipp-20130306/Ohana/src/addstar/src/ImageIndex.c )
• src/addstar/src/UpdateImageIDs.c (modified) (2 diffs)
• src/addstar/test/simple.dvo (modified) (4 diffs)

trunk/Ohana/src/addstar/Makefile

@@ -90 +90 @@
 $(SRC)/GetFileMode.$(ARCH).o \
 $(SRC)/ReadImageHeader.$(ARCH).o \
+$(SRC)/ImageIndex.$(ARCH).o \
 $(SRC)/UpdateImageIDs.$(ARCH).o \
 $(SRC)/update_coords.$(ARCH).o \
@@ -207 +208 @@
 $(SRC)/ReadStarsTEXT.$(ARCH).o \
 $(SRC)/ReadStarsSDSS.$(ARCH).o \
+$(SRC)/ImageIndex.$(ARCH).o \
 $(SRC)/UpdateImageIDs.$(ARCH).o \
 $(SRC)/FilterStars.$(ARCH).o \

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

@@ -56 +56 @@
   char *refcat;
 } DVO_DATA;
+
+# define IDTYPE int
+
+typedef struct {
+  IDTYPE Nimage;
+  IDTYPE minID;
+  IDTYPE maxID;
+  IDTYPE range;
+  IDTYPE *imageID;
+  IDTYPE *externID;
+  char *found;
+} ImageIndex;
 
 typedef struct sockaddr_in SockAddress;
@@ -275 +287 @@
 int UpdateImageIDs (Stars *stars, unsigned int Nstars, Image *images, off_t Nimages);
 
+int CheckDuplicateImageIDs (Image *images, off_t Nimages);
+int ImageIndexFileInit ();
+
 int LoadDataSDSS (FILE *f, char *file, Image **images, off_t *nvalid, Stars **stars, unsigned int *Nstars, Header **headers, off_t *extsize, HeaderSet *headerSets, off_t Nimages);
 int LoadDataPMM (FILE *f, char *file, Image **images, off_t *nvalid, Stars **stars, unsigned int *Nstars);

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

@@ -18 +18 @@
     if (VERBOSE) fprintf (stderr, "can't find %s, creating a new one\n", ImageCat);
     dvo_image_create (&db, GetZeroPoint());
-    isEmpty = TRUE;
+    ImageIndexFileInit ();
+  isEmpty = TRUE;
   } else {
     /* position to start of file */
@@ -51 +52 @@
   }
 
+  // set and update the imageID sequence
+  // the file holding the index is created above if this is an empty db
+  CheckDuplicateImageIDs (images, Nimages);
+
   imageID += Nimages;
   status = gfits_modify (&db.header, "IMAGEID", "%u", 1, imageID);

trunk/Ohana/src/addstar/test/simple.dvo

@@ -52 +52 @@
   exec mkcmf test.in.txt test.cmf -date 2008/1/1 -time 01:00:00 -radec $RA $DEC -type $1
   if ($TAP_VERBOSE)
+    echo exec addstar -D CATDIR catdir.test -D CAMERA simtest test.cmf -D CATFORMAT $2 -quick-airmass
     exec addstar -D CATDIR catdir.test -D CAMERA simtest test.cmf -D CATFORMAT $2 -quick-airmass
   else
@@ -68 +69 @@
 
   for i 0 $testfields:n
+    if ($TAP_VERBOSE) echo $testfields:$i
     list name -split $testfields:$i
     if ("$name:0" == "SKIP") continue
@@ -337 +339 @@
   PSF_INST_FLUX     : SKIP # not ingested into DVO
   PSF_INST_FLUX_SIG : SKIP # not ingested into DVO
-  AP_MAG_STANDARD   : mag:aperinst # FAIL
+  AP_MAG            : mag:aperinst # FAIL
   AP_MAG_RAW        : SKIP # not ingested into DVO
   AP_MAG_RADIUS     : SKIP # not ingested into DVO
@@ -346 +348 @@
   PEAK_FLUX_AS_MAG  : SKIP # not ingested into DVO
   SKY               : sky       
-  SKY_SIG           : sky_err   
+  SKY_SIGMA         : sky_err   
   PSF_CHISQ         : psf_chisq 
   CR_NSIGMA         : cr_nsigma