Changeset 38713

Timestamp:

Sep 7, 2015, 3:44:13 PM (11 years ago)

Author:

eugene

Message:

add dvorepair mode to fix the missing warp_skyfile_id values

Location:

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

Files:

• Makefile (modified) (1 diff)
• include/dvomerge.h (modified) (1 diff)
• src/dvorepair.c (modified) (1 diff)
• src/dvorepairFixImages.c (modified) (4 diffs)
• src/dvorepairFixWarpIDs.c (added)
• src/help.c (modified) (1 diff)

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

@@ -124 +124 @@
 $(SRC)/dvorepair.$(ARCH).o \
 $(SRC)/dvorepairFixCPT.$(ARCH).o \
+$(SRC)/dvorepairFixWarpIDs.$(ARCH).o \
 $(SRC)/dvorepairImagesVsMeasures.$(ARCH).o \
 $(SRC)/dvorepairDeleteImageList.$(ARCH).o \

branches/eam_branches/ipp-20150625/Ohana/src/dvomerge/include/dvomerge.h

@@ -246 +246 @@
 
 int dvorepair_by_objID (int argc, char **argv);
-
+int dvorepairFixWarpIDs (int argc, char **argv);
+

branches/eam_branches/ipp-20150625/Ohana/src/dvomerge/src/dvorepair.c

@@ -10 +10 @@
   dvorepair_help(argc, argv);
   
+  if (!strcmp(argv[1], "-fix-warp-ids")) dvorepairFixWarpIDs(argc, argv);
+
   if (!strcmp(argv[1], "-fix-cpt")) dvorepairFixCPT(argc, argv);
   if (!strcmp(argv[1], "-fix-cpt-by-objID")) dvorepair_by_objID(argc, argv);

branches/eam_branches/ipp-20150625/Ohana/src/dvomerge/src/dvorepairFixImages.c

@@ -255 +255 @@
 
   /* setup image table format and lock */
-  gfits_db_init (oldDB);
+  gfits_db_init (&db);
   db.mode   = oldDB->mode;
   db.format = oldDB->format;
@@ -266 +266 @@
   /* load or create the image table */
   myAssert (db.dbstate == LCK_EMPTY, "do not overwrite exiting image table");
-  myAssert (db.format == DVO_FORMAT_PS1_V2, "format mismatch");
+  // myAssert (db.format == DVO_FORMAT_PS1_V2, "format mismatch");
 
   dvo_image_create (&db, GetZeroPoint());
+  gfits_copy_header (&oldDB->header, &db.header);
   
   // replace the existing buffer with the image array
@@ -277 +278 @@
   nbytes = gfits_data_size (db.ftable.header);
   db.ftable.datasize = nbytes;
-  db.ftable.buffer = (char *) imageOut;
-  REALLOCATE (db.ftable.buffer, char, MAX (nbytes, 1));
+
+  free (db.ftable.buffer);
+  ALLOCATE (db.ftable.buffer, char, MAX (nbytes, 1));
+  memcpy (db.ftable.buffer, imageOut, nbytes);
   memset (&db.ftable.buffer[Nx*Nout], ' ', nbytes - Nx*Nout);
 
@@ -295 +298 @@
   dvo_image_unlock (&db);
 
+  gfits_db_free (&db); 
+
   return TRUE;
 }

branches/eam_branches/ipp-20150625/Ohana/src/dvomerge/src/help.c

@@ -172 +172 @@
 
   fprintf (stderr, "USAGE\n");
+  fprintf (stderr, "  dvorepair -fix-warp-ids (catdir) (idfile) - regenerate images.dat warp_skyfile_ids (EXTERN_ID) values\n");
   fprintf (stderr, "  dvorepair -fix-cpt (images) (rootlist) - regenerate cpt & cps files from the cpm files\n");
   fprintf (stderr, "  dvorepair -images-vs-measures (catdir) (Ntol) - find images with too many missing detections\n");