Changeset 39619 for trunk

Timestamp:

Jul 1, 2016, 10:09:40 AM (10 years ago)

Author:

eugene

Message:

add code to repair broken stack-to-image links; carefully check the chip, warp, stack measurement and image consistency

Location:

trunk/Ohana/src/relastro

Files:

• Makefile (modified) (2 diffs)
• include/relastro.h (modified) (4 diffs)
• src/CheckMeasureToImage.c (added)
• src/RepairStackMeasures.c (added)
• src/StackImageMaps.c (added)
• src/UpdateMeasures.c (modified) (3 diffs)
• src/UpdateObjectOffsets.c (modified) (3 diffs)
• src/args.c (modified) (2 diffs)
• src/relastro.c (modified) (1 diff)
• src/relastro_client.c (modified) (1 diff)

trunk/Ohana/src/relastro/Makefile

@@ -25 +25 @@
 
 RELASTRO = \
+$(SRC)/CheckMeasureToImage.$(ARCH).o \
+$(SRC)/RepairStackMeasures.$(ARCH).o \
+$(SRC)/StackImageMaps.$(ARCH).o \
 $(SRC)/RepairWarps.$(ARCH).o \
 $(SRC)/RepairWarpMeasures.$(ARCH).o \
@@ -110 +113 @@
 
 RELASTRO_CLIENT = \
+$(SRC)/CheckMeasureToImage.$(ARCH).o \
+$(SRC)/RepairStackMeasures.$(ARCH).o \
+$(SRC)/StackImageMaps.$(ARCH).o \
 $(SRC)/RepairWarps.$(ARCH).o \
 $(SRC)/RepairWarpMeasures.$(ARCH).o \

trunk/Ohana/src/relastro/include/relastro.h

@@ -257 +257 @@
 
 typedef struct {
+  int NStackFixExtID;
+  int NStackFixImageID;
+  int NstackBadCoords;
+  int NstackFailRepair_v1;
+  int NstackFailRepair_v2;
+  int NstackFixCoords;
+  int NstackMissImage;
+  int NstackMissTime;
+  int NstackNoImageID;
+} StackRepairResult;
+
+typedef struct {
   int NfixChipID;
   int NfixStackID;
@@ -269 +281 @@
 } WarpRepairResult;
 
+typedef struct {
+  int NstackNoImageID;
+  int NstackBadCoords;
+  int NstackBadTime;
+  int NstackBadImageCoords;
+  int NwarpNoImageID;
+  int NwarpBadCoords;
+  int NwarpBadTime;
+  int NwarpBadImageCoords;
+  int NchipNoImageID;
+  int NchipBadCoords;
+  int NchipBadTime;
+  int NchipBadImageCoords;
+} CheckMeasureResult;
+
 # define ID_MEAS_OBJECT_HAS_2MASS ID_MEAS_POOR_PHOTOM
 
@@ -333 +360 @@
 int    USE_ICRF_POLE;
 
+int    REPAIR_STACKS;
 int    USE_IMAGE_COORDS_FOR_REPAIR;
 int    USE_ALL_IMAGES;
+int    CHECK_MEASURE_TO_IMAGE;
 
 int    RESET;
@@ -834 +863 @@
 uint64_t CreatePSPSStackDetectionID(int sourceID, int imageID, int detID);
 uint64_t CreatePSPSDetectionID(double tobs, int ccdid, int detID);
+
+void sort_by_ra (double *R, double *D, int *I, int *S, int N);
+void FreeStackGroups (void);
+int GetStackSeq (Image *image, double Rstk, double Dstk, unsigned short photcode, float X, float Y);
+int MakeStackIndex (void);
+int RepairStackID (StackRepairResult *result, Image *image, double Rave, double Dave, Measure *measureB, MeasureTiny *measureT);
+StackRepairResult RepairStackMeasures (Catalog *catalog);
+int CheckMeasureToImage (Catalog *catalog);

trunk/Ohana/src/relastro/src/UpdateMeasures.c

@@ -11 +11 @@
   image = getimages (&Nimage, NULL);
 
-  // track measurements which are far from their original position (poor at pole)
-  int NoffRAori = 0; 
-  int NoffDECori = 0;
+  for (i = 0; i < Ncatalog; i++) {
 
-  int NoffRAchip = 0; 
-  int NoffRAstack = 0; 
-  int NoffRAwarp = 0; 
+    // track measurements which are far from their original position (poor at pole)
+    int NoffRAori = 0; 
+    int NoffDECori = 0;
 
-  int NoffDECchip = 0; 
-  int NoffDECstack = 0; 
-  int NoffDECwarp = 0; 
+    int NoffRAchip = 0; 
+    int NoffRAstack = 0; 
+    int NoffRAwarp = 0; 
 
-  for (i = 0; i < Ncatalog; i++) {
+    int NoffDECchip = 0; 
+    int NoffDECstack = 0; 
+    int NoffDECwarp = 0; 
+
     myAssert (!catalog[i].Nmeasure || catalog[i].measureT, "programming error");
     for (j = 0; j < catalog[i].Naverage; j++) {
@@ -35 +36 @@
       MeasureTiny *measureT = &catalog[i].measureT[j];
       Measure     *measureB = catalog[i].measure ? &catalog[i].measure[j] : NULL;
+
+      if (measureB->averef == 0x01a) {
+        // fprintf (stderr, "test object\n");
+      }
+      if ((measureB->averef == 0x01a) && (measureB->detID == 0x000d469a)) {
+        // fprintf (stderr, "example object\n");
+      }
+      if ((measureB->averef == 0x01e) && (measureB->detID == 0x000d487f)) {
+        // fprintf (stderr, "example object\n");
+      }
 
       off_t im = getImageByID (measureT->imageID);
@@ -111 +122 @@
       }
     }
+    if (VERBOSE) fprintf (stderr, "%s : Noff ori RA %d ( %d %d %d ), Noff ori DEC %d ( %d %d %d )\n", catalog[i].filename, NoffRAori, NoffRAchip, NoffRAstack, NoffRAwarp, NoffDECori, NoffDECchip, NoffDECstack, NoffDECwarp);
   }
-  // printNcatTotal ();
-
-  if (VERBOSE) fprintf (stderr, "Noff ori RA %d ( %d %d %d ), Noff ori DEC %d ( %d %d %d )\n", NoffRAori, NoffRAchip, NoffRAstack, NoffRAwarp, NoffDECori, NoffDECchip, NoffDECstack, NoffDECwarp);
 
   return (TRUE);

trunk/Ohana/src/relastro/src/UpdateObjectOffsets.c

@@ -57 +57 @@
     findImages (&catalog, 1, FALSE);
 
+    if (REPAIR_STACKS) RepairStackMeasures (&catalog);
+
     // update the detection coordinates using the new image parameters
     UpdateMeasures (&catalog, 1);
@@ -63 +65 @@
     // if Galaxy Motion Model correction is active, do not apply at this last stage 
     UpdateObjects (&catalog, 1, -1);
+
+    if (CHECK_MEASURE_TO_IMAGE) CheckMeasureToImage (&catalog);
 
     free_tiny_values(&catalog);
@@ -190 +194 @@
     if (USE_FIXED_PIXCOORDS) strextend (&command, "-D USE_FIXED_PIXCOORDS 1"); 
 
+    if (REPAIR_STACKS)          strextend (&command, "-repair-stacks");
+    if (CHECK_MEASURE_TO_IMAGE) strextend (&command, "-check-measures");
+
     if (PHOTCODE_KEEP_LIST) strextend (&command, "+photcode %s", PHOTCODE_KEEP_LIST);
     if (PHOTCODE_SKIP_LIST) strextend (&command, "-photcode %s", PHOTCODE_SKIP_LIST);

trunk/Ohana/src/relastro/src/args.c

@@ -56 +56 @@
     remove_argument (N, &argc, argv);
     RELASTRO_OP = OP_REPAIR_WARPS;
+  }
+
+  REPAIR_STACKS = FALSE;
+  if ((N = get_argument (argc, argv, "-repair-stacks"))) {
+    remove_argument (N, &argc, argv);
+    REPAIR_STACKS = TRUE;
+  }
+  CHECK_MEASURE_TO_IMAGE = FALSE;
+  if ((N = get_argument (argc, argv, "-check-measures"))) {
+    remove_argument (N, &argc, argv);
+    CHECK_MEASURE_TO_IMAGE = TRUE;
   }
 
@@ -683 +694 @@
     remove_argument (N, &argc, argv);
     RELASTRO_OP = OP_REPAIR_WARPS;
+  }
+
+  REPAIR_STACKS = FALSE;
+  if ((N = get_argument (argc, argv, "-repair-stacks"))) {
+    remove_argument (N, &argc, argv);
+    REPAIR_STACKS = TRUE;
+  }
+  CHECK_MEASURE_TO_IMAGE = FALSE;
+  if ((N = get_argument (argc, argv, "-check-measures"))) {
+    remove_argument (N, &argc, argv);
+    CHECK_MEASURE_TO_IMAGE = TRUE;
   }
 

trunk/Ohana/src/relastro/src/relastro.c

@@ -46 +46 @@
       }
 
+      if (REPAIR_STACKS && !PARALLEL) MakeStackIndex ();
+
       // iterate over catalogs to make detection coordinates consistant
       UpdateObjectOffsets (skylist, 0, NULL);
+
+      if (REPAIR_STACKS && !PARALLEL) FreeStackGroups ();
 
       if (!PARALLEL) {

trunk/Ohana/src/relastro/src/relastro_client.c

@@ -90 +90 @@
       load_images (&db, skylist, FALSE, USE_ALL_IMAGES);
 
+      if (REPAIR_STACKS) MakeStackIndex ();
+
       UpdateObjectOffsets (skylist, HOST_ID, HOSTDIR);
       
+      if (REPAIR_STACKS) FreeStackGroups ();
+
       freeImages (db.ftable.buffer);
       gfits_db_free (&db);