Changeset 35711

Timestamp:

Jun 25, 2013, 6:14:05 PM (13 years ago)

Author:

eugene

Message:

added esoteric function to repair the 3pi LAP db

Location:

branches/eam_branches/ipp-20130509/Ohana/src/delstar

Files:

• Makefile (modified) (3 diffs)
• include/delstar.h (modified) (4 diffs)
• src/ImageOpsFixLAP.c (added)
• src/ImageSubsetFixLAP.c (added)
• src/args.c (modified) (3 diffs)
• src/delete_duplicate_measures.c (modified) (1 diff)
• src/delete_fix_LAP.c (added)
• src/delstar.c (modified) (1 diff)
• src/delstar_client.c (modified) (1 diff)

branches/eam_branches/ipp-20130509/Ohana/src/delstar/Makefile

@@ -31 +31 @@
 $(SRC)/delete_duplicate_images.$(ARCH).o \
 $(SRC)/delete_duplicate_measures.$(ARCH).o \
+$(SRC)/delete_fix_LAP.$(ARCH).o \
 $(SRC)/delete_image_photcodes.$(ARCH).o \
 $(SRC)/delete_photcodes.$(ARCH).o \
@@ -40 +41 @@
 $(SRC)/parse_time.$(ARCH).o       \
 $(SRC)/ImageIDsOps.$(ARCH).o       \
+$(SRC)/ImageOpsFixLAP.$(ARCH).o       \
+$(SRC)/ImageSubsetFixLAP.$(ARCH).o       \
 $(SRC)/check_permissions.$(ARCH).o \
 $(SRC)/Shutdown.$(ARCH).o          
@@ -50 +53 @@
 $(SRC)/delete_duplicate_images.$(ARCH).o \
 $(SRC)/delete_duplicate_measures.$(ARCH).o \
+$(SRC)/delete_fix_LAP.$(ARCH).o \
 $(SRC)/delete_photcodes.$(ARCH).o \
 $(SRC)/delete_photcodes_single.$(ARCH).o \
 $(SRC)/ImageIDsOps.$(ARCH).o       \
+$(SRC)/ImageOpsFixLAP.$(ARCH).o       \
+$(SRC)/ImageSubsetFixLAP.$(ARCH).o       \
 $(SRC)/Shutdown.$(ARCH).o          
 

branches/eam_branches/ipp-20130509/Ohana/src/delstar/include/delstar.h

@@ -21 +21 @@
 } IndexArray;
 
+// to determine the image ID, we need time (tzero + trate) and photcode
+typedef struct {
+  unsigned int     imageID;
+  unsigned int     externID;
+  unsigned short   NX;                   // image width
+  unsigned short   NY;                   // image height
+  unsigned int     nstar;                // number of stars on the image
+  e_time           tzero;                // readout time (row 0)
+  e_time           tmin;                 // start exp - 1
+  e_time           tmax;                 // stop exp + 1
+  unsigned char    trate;                // scan rate (100 usec/pixel)
+  short            photcode;
+} ImageSubset;
+
 /* global variables set in parameter file */
 char   ImageCat[DVO_MAX_PATH];
@@ -33 +47 @@
 
 char  *IMAGENAME;
+char  *IMAGES;
 
 double NSIGMA;
@@ -63 +78 @@
 
 int    MODE;
-enum {MODE_NONE, MODE_IMAGENAME, MODE_IMAGEFILE, MODE_TIME, MODE_ORPHAN, MODE_MISSED, MODE_PHOTCODES, MODE_DUP_IMAGES, MODE_DUP_MEASURES};
+enum {MODE_NONE, MODE_IMAGENAME, MODE_IMAGEFILE, MODE_TIME, MODE_ORPHAN, MODE_MISSED, MODE_PHOTCODES, MODE_DUP_IMAGES, MODE_DUP_MEASURES, MODE_FIX_LAP};
 
 char DateKeyword[64], DateMode[64], UTKeyword[64], MJDKeyword[64], JDKeyword[64];
@@ -131 +146 @@
 int delete_duplicate_measures_catalog (Catalog *catalog);
 
+int delete_fix_LAP (ImageSubset *image, off_t Nimage);
+int delete_fix_LAP_catalog (Catalog *catalog, ImageSubset *image, off_t Nimage);
+int delete_fix_LAP_measures (off_t *measureDrop, Catalog *catalog, ImageSubset *image, off_t Nimage);
+int delete_fix_LAP_parallel (SkyList *sky, ImageSubset *image, off_t Nimage);
+
+void initImageIndex (ImageSubset *image, off_t Nimage_init);
+int *getImageIndex ();
+int FindIDexp (off_t *ID, off_t *Seq, e_time time, short photcode);
+int FindIDstk (off_t *ID, off_t *Seq, short *photcode, off_t extID);
+
+ImageSubset *ImageSubsetLoad(char *filename, off_t *nimage);
+int ImageSubsetSave(char *filename, ImageSubset *image, off_t Nimage);
+ImageSubset *ImagesToSubset (Image *image, off_t N);
+
+void sort_fullIDs (uint64_t *I, int *S, off_t N);

branches/eam_branches/ipp-20130509/Ohana/src/delstar/src/args.c

@@ -175 +175 @@
     remove_argument (N, &argc, argv);
     SKIP_IMAGES = TRUE; // we do not need to load the images for -dup-measures
+  }
+  if ((N = get_argument (argc, argv, "-fix-LAP"))) {
+    if (MODE != MODE_NONE) usage();
+    MODE = MODE_FIX_LAP;
+    remove_argument (N, &argc, argv);
   }
   if ((N = get_argument (argc, argv, "-photcodes"))) {
@@ -344 +349 @@
   }
 
+  IMAGES = NULL;
+  if ((N = get_argument (argc, argv, "-images"))) {
+    remove_argument (N, &argc, argv);
+    IMAGES = strcreate (argv[N]);
+    remove_argument (N, &argc, argv);
+  }
+
   MODE = MODE_NONE;
   if ((N = get_argument (argc, argv, "-photcodes"))) {
@@ -362 +374 @@
     remove_argument (N, &argc, argv);
   }
+  if ((N = get_argument (argc, argv, "-fix-LAP"))) {
+    if (MODE != MODE_NONE) usage();
+    MODE = MODE_FIX_LAP;
+    remove_argument (N, &argc, argv);
+    if (!IMAGES) delstar_client_usage();
+  }
 
   if (MODE == MODE_NONE) delstar_client_usage ();

branches/eam_branches/ipp-20130509/Ohana/src/delstar/src/delete_duplicate_measures.c

@@ -153 +153 @@
 }
 
-void sort_fullIDs (uint64_t *I, int *S, off_t N);
-
 int delete_duplicate_measures_catalog (Catalog *catalog) {
 

branches/eam_branches/ipp-20130509/Ohana/src/delstar/src/delstar.c

@@ -28 +28 @@
       exit (0);
       break;
+    case MODE_FIX_LAP: {
+        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 (2);
+        }
+        dvo_image_unlock (&db); 
+
+        // the imageSubset here is a reduced set of fields, not a reduced set of images
+        ImageSubset *subset = ImagesToSubset (image, Nimage);
+
+        if (!delete_fix_LAP (subset, Nimage)) exit (1);
+        exit (0);
+        break;
+      }
     case MODE_IMAGEFILE:
       delete_imagefile (&db);

branches/eam_branches/ipp-20130509/Ohana/src/delstar/src/delstar_client.c

@@ -29 +29 @@
       exit (0);
       break;
+
+    case MODE_FIX_LAP: {
+      off_t Nimage;
+      ImageSubset *image = ImageSubsetLoad (IMAGES, &Nimage);
+      if (!image) {
+        fprintf (stderr, "failed to read image table\n");
+        exit (1);
+      }
+
+      if (!delete_fix_LAP (image, Nimage)) exit (1);
+      exit (0);
+      break;
+    }
+
     case MODE_IMAGEFILE:
       break;