Changeset 37490

Timestamp:

Oct 16, 2014, 11:10:21 AM (12 years ago)

Author:

eugene

Message:

adding new program to check for duplicate image IDs (extern_id)

Location:

branches/eam_branches/ipp-20140904/Ohana/src/dvomerge

Files:

• Makefile (modified) (1 diff)
• include/dvoutils.h (modified) (1 diff)
• src/dvoutils_load_image_index.c (added)
• src/dvoutils_uniq_images.c (modified) (10 diffs)

branches/eam_branches/ipp-20140904/Ohana/src/dvomerge/Makefile

@@ -154 +154 @@
 $(SRC)/dvoutils.$(ARCH).o \
 $(SRC)/dvoutils_args.$(ARCH).o \
-$(SRC)/dvoutils_uniq_images.$(ARCH).o
+$(SRC)/dvoutils_uniq_images.$(ARCH).o \
+$(SRC)/dvoutils_load_image_index.$(ARCH).o
 
 $(DVOUTILS)  : $(INC)/dvoutils.h

branches/eam_branches/ipp-20140904/Ohana/src/dvomerge/include/dvoutils.h

@@ -30 +30 @@
 int dvoutils_args (int *argc, char **argv);
 int dvoutils_uniq_images (char *filename);
+int *dvoutils_load_image_index (char *filename, int *nindex);
+
+Image *dvoutils_load_image_table (char *filename, int *nimage);

branches/eam_branches/ipp-20140904/Ohana/src/dvomerge/src/dvoutils_uniq_images.c

@@ -17 +17 @@
   }
 
-  int minID = -1;
-  int maxID = -1;
-  int *IDlist = NULL;
+  int    minID  = -1;
+  int    maxID  = -1;
+  int  *IDlist  = NULL;
+  int  *DBfound = NULL;
+  int  *DBindex = NULL;
   
+  int Ndb = 0;
+  int NDB = 100;
+  char **DBlist = NULL;
+  ALLOCATE (DBlist, char *, NDB); // list of the names of the image database tables.  
+
   char imFile[1024];
   while (scan_line_maxlen (f, imFile, 1024) != EOF) {
@@ -33 +40 @@
     }
 
-    FITS_DB db;
+    int Nimage;
+    // Image *image = dvoutils_load_image_table (imFile, &Nimage);
+    int *extern_id = dvoutils_load_image_index (imFile, &Nimage);
+    if (!extern_id) continue;
 
-    gfits_db_init (&db);
-    db.lockstate = LCK_SOFT;
-    db.timeout   = 120.0;
-
-    if (!gfits_db_lock (&db, imFile)) {
-      fprintf (stderr, "error opening image catalog %s (1)\n", imFile);
-      exit (3);
-    }
-
-    if (db.dbstate == LCK_EMPTY) {
-      fprintf (stderr, "note: image catalog is empty\n");
-      // free db
-      continue;
-    }
-
-    int status = dvo_image_load (&db, TRUE, FALSE);
-    gfits_db_close (&db);
-    
-    if (!status) {
-      fprintf (stderr, "problem loading image database table\n");
-      exit (4);
-    }
-
-    off_t Nimage;
-    Image *image = gfits_table_get_Image (&db.ftable, &Nimage, &db.swapped);
-    if (!image) {
-      fprintf (stderr, "ERROR: failed to read images\n");
-      exit (5);
-    }
+    DBlist[Ndb] = strcreate (imFile);
 
     // now loop over all of the images and accumulate the array of extern_id values (skip
@@ -76 +58 @@
     int i;
     for (i = 0; i < Nimage; i++) {
-      if (!image[i].externID) continue;
-      myMaxID = MAX(image[i].externID, myMaxID);
-      myMinID = MIN(image[i].externID, myMinID);
+      if (!extern_id[i]) continue;
+      myMaxID = MAX(extern_id[i], myMaxID);
+      myMinID = MIN(extern_id[i], myMinID);
     }
 
@@ -86 +68 @@
     if (!IDlist) {
       int Nindex = myMaxID - myMinID + 1;
-      ALLOCATE (IDlist, int, Nindex);
-      memset (IDlist, 0, Nindex*sizeof(int));
+      ALLOCATE (IDlist,  int,  Nindex); // number of times this ID is seen.  IDlist[i] corresponds to extern_id = i + minID
+      ALLOCATE (DBfound, int,  Nindex); // index of first DB in which this ID is seen (if n = DBfound[i], the correspond ID was seen in DB n
+      ALLOCATE (DBindex, int,  Nindex); // sequence of this image in the first DB for which this ID was found
+
+      for (i = 0; i < Nindex; i++) {
+        IDlist[i]  =  0;
+        DBfound[i] = -1;
+        DBindex[i] = -1;
+      }
+
       minID = myMinID;
       maxID = myMaxID;
@@ -99 +89 @@
       myAssert (oldNindex <= Nindex, "impossible!");
 
-      int *newIDlist = NULL;
-      ALLOCATE (newIDlist, int, Nindex);
-      memset (newIDlist, 0, Nindex*sizeof(int));
+      int *newIDlist  = NULL;
+      int *newDBfound = NULL;
+      int *newDBindex = NULL;
+
+      ALLOCATE (newIDlist,  int, Nindex);
+      ALLOCATE (newDBfound, int, Nindex);
+      ALLOCATE (newDBindex, int, Nindex);
+
+      for (i = 0; i < Nindex; i++) {
+        newIDlist[i]  =  0;
+        newDBfound[i] = -1;
+        newDBindex[i] = -1;
+      }
       
       // if myMinID >= minID, newMinID = minID -> offset = 0
@@ -108 +108 @@
 
       // save the old values
-      memcpy (&newIDlist[offset], IDlist, oldNindex*sizeof(int));
+      memcpy (&newIDlist [offset], IDlist,  oldNindex*sizeof(int));
+      memcpy (&newDBfound[offset], DBfound, oldNindex*sizeof(int));
+      memcpy (&newDBindex[offset], DBindex, oldNindex*sizeof(int));
 
       free (IDlist);
-      IDlist = newIDlist;
+      free (DBfound);
+      free (DBindex);
+
+      IDlist  = newIDlist;
+      DBfound = newDBfound;
+      DBindex = newDBindex;
 
       minID = newMinID;
@@ -118 +125 @@
 
     for (i = 0; i < Nimage; i++) {
-      if (!image[i].externID) continue;
-      int n = image[i].externID - minID;
+      if (!extern_id[i]) continue;
+      int n = extern_id[i] - minID;
+      if (IDlist[n] == 0) {
+        DBfound[n] = Ndb;
+        DBindex[n] = i;
+      }
       IDlist[n] ++;
     }
@@ -127 +138 @@
 
       for (i = 0; i < Nimage; i++) {
-        if (!image[i].externID) continue;
-        fprintf (stderr, "%d => %d\n", image[i].externID, image[i].externID - minID);
+        if (!extern_id[i]) continue;
+        fprintf (stderr, "%d => %d\n", extern_id[i], extern_id[i] - minID);
       }
 
@@ -138 +149 @@
       }
     }
+
+    // we are done with the db file, bump the counter
+    Ndb ++;
+    CHECK_REALLOCATE (DBlist, char *, NDB, Ndb, 100);
   }
 
@@ -147 +162 @@
   for (i = 0; i < Nindex; i++) {
     if (IDlist[i] < 2) continue;
-    fprintf (stderr, "%d : %d\n", i + minID, IDlist[i]);
+    int n = DBfound[i];
+    myAssert (n > -1, "impossible!");
+    fprintf (stderr, "%d : %d -- in %s (%d) : %d \n", i + minID, IDlist[i], DBlist[n], DBfound[i], DBindex[i]);
   }