Changeset 41604

Timestamp:

May 21, 2021, 11:11:57 AM (5 years ago)

Author:

eugene

Message:

strip out the old code to repair warps (code moved to dvomerge)

Location:

branches/eam_branches/relphot.20210521

Files:

• Makefile (modified) (4 diffs)
• include/relphot.h (modified) (2 diffs)
• src/ImageOps.c (modified) (1 diff)
• src/RepairWarpMeasures.c (deleted)
• src/StackImageMaps.c (deleted)
• src/WarpImageMaps.c (deleted)
• src/relphot.c (modified) (2 diffs)
• src/relphot_images.c (modified) (1 diff)
• src/relphot_objects.c (modified) (5 diffs)
• test/relphot.grid.dvo (added)

branches/eam_branches/relphot.20210521/Makefile

@@ -29 +29 @@
 $(SRC)/StatDataSetOps.$(ARCH).o  \
 $(SRC)/ConfigInit.$(ARCH).o      \
-$(SRC)/GridOpsNew.$(ARCH).o      \
+$(SRC)/GridOps.$(ARCH).o         \
 $(SRC)/ImageOps.$(ARCH).o        \
 $(SRC)/ImageSubset.$(ARCH).o     \
@@ -39 +39 @@
 $(SRC)/Shutdown.$(ARCH).o        \
 $(SRC)/StarOps.$(ARCH).o         \
-$(SRC)/WarpImageMaps.$(ARCH).o   \
-$(SRC)/StackImageMaps.$(ARCH).o  \
-$(SRC)/RepairWarpMeasures.$(ARCH).o      \
-$(SRC)/myIndex.$(ARCH).o         \
 $(SRC)/psps_ids.$(ARCH).o        \
 $(SRC)/args.$(ARCH).o            \
@@ -92 +88 @@
 $(SRC)/StatDataSetOps.$(ARCH).o  \
 $(SRC)/ConfigInit.$(ARCH).o      \
-$(SRC)/GridOpsNew.$(ARCH).o      \
+$(SRC)/GridOps.$(ARCH).o         \
 $(SRC)/ImageOps.$(ARCH).o        \
 $(SRC)/ImageSubset.$(ARCH).o     \
@@ -102 +98 @@
 $(SRC)/Shutdown.$(ARCH).o        \
 $(SRC)/StarOps.$(ARCH).o         \
-$(SRC)/WarpImageMaps.$(ARCH).o   \
-$(SRC)/StackImageMaps.$(ARCH).o  \
-$(SRC)/RepairWarpMeasures.$(ARCH).o      \
-$(SRC)/myIndex.$(ARCH).o         \
 $(SRC)/psps_ids.$(ARCH).o        \
 $(SRC)/bcatalog.$(ARCH).o        \

branches/eam_branches/relphot.20210521/include/relphot.h

@@ -49 +49 @@
 
 typedef enum {
-    MODE_NONE   = 0,
-    MODE_LOAD   = 1,
-    MODE_UPDATE = 2,
+    MODE_NONE           = 0,
+    MODE_LOAD           = 1,
+    MODE_UPDATE         = 2,
     MODE_UPDATE_OBJECTS = 3,
-    MODE_SYNTH_PHOT = 4,
+    MODE_SYNTH_PHOT     = 4,
 } ModeType;
 
@@ -814 +814 @@
 void free_astrom_table ();
 
-int RepairWarpMeasures (Catalog *catalog);
-
-int FindWarpGroups (void);
-int GetWarpSeq (Image *image, int obstime, unsigned short photcode, double Rave, double Dave, float X, float Y);
-void FreeWarpGroups (void);
-
-myIndexType *myIndexInit ();
-int myIndexFree (myIndexType *myIndex);
-int myIndexUpdateLimits (myIndexType *myIndex, int value);
-int myIndexSetRange (myIndexType *myIndex);
-int myIndexSetEntry (myIndexType *myIndex, int value, int entry);
-int myIndexGetEntry (myIndexType *myIndex, int value);
-
 uint64_t CreatePSPSObjectID(double ra, double dec);
 uint64_t CreatePSPSStackDetectionID(int sourceID, int imageID, int detID);
 uint64_t CreatePSPSDetectionID(double tobs, int ccdid, int detID);
 
-int MakeStackIndex (void);
-void FreeStackGroups (void);
-int GetStackSeq (Image *image, double Rstk, double Dstk, unsigned short photcode, float X, float Y);
 void sort_by_ra (double *R, double *D, int *I, int *S, int N);
-
-void RepairWarpMeasuresOpenLogfile ();
-void RepairWarpMeasuresCloseLogfile ();
 
 void dump_tgroups (Catalog *catalog, int Npass);

branches/eam_branches/relphot.20210521/src/ImageOps.c

@@ -507 +507 @@
     offset = 0.0;
   }
-
-  // to do this, I need to pass in the catalog and flatcorr pointers
-  // int flat_id = image[i].photom_map_id;
-  // if (flat_id) {
-  //   offset = FlatCorrectionOffset (flatcorr, flat_id, catalog[cat].measureT[meas].Xccd, catalog[cat].measureT[meas].Yccd);
-  // }
-
   return (offset);
 }

branches/eam_branches/relphot.20210521/src/relphot.c

@@ -34 +34 @@
   switch (mode) {
     case UPDATE_IMAGES:
+      // calculate zero points for images (may group my exposure [mosaic], night [tgroups]; may measure flat-correction)
       // IF CALLED WITH NLOOP == 0, DOES NOT LOAD bcatalog, just loads image table and generates ImageSubset.dat
+      // If called with -update, calls reload_catalogs() just like apply_offsets
       relphot_images (skylist);
       relphot_free (sky, skylist);
@@ -52 +54 @@
 
     case PARALLEL_REGIONS:
-      // run image updates in parallel across multiple remote machines
+      // calculate zero points for images (may group my exposure [mosaic], night [tgroups]; may measure flat-correction)
+      // equivalent to relphot_images, but run in parallel across multiple remote machines
       relphot_parallel_regions (sky);
       relphot_free (sky, skylist);

branches/eam_branches/relphot.20210521/src/relphot_images.c

@@ -45 +45 @@
   if (!UPDATE) dvo_image_unlock (&db); 
 
-  // load the flat correction table (if defined)
-  // we no longer need to do this: the flatcorrection is now saved in measure.Mflat
-# if (0)
-  char flatcorrfile[256];
-  sprintf (flatcorrfile, "%s/flatcorr.fits", CATDIR);
-  FlatCorrectionTable *flatcorr = FlatCorrectionLoad (flatcorrfile, VERBOSE);
-# endif
-  FlatCorrectionTable *flatcorr = NULL;
+  FlatCorrectionTable *flatcorr = NULL; // no longer used here 
 
   initGridBins (); // allocates the empty array of corrections (elements are build below)

branches/eam_branches/relphot.20210521/src/relphot_objects.c

@@ -43 +43 @@
   // load the ZP corrections here
   if (SYNTH_ZERO_POINTS) SynthZeroPointsLoad (SYNTH_ZERO_POINTS);
-
-  if (REPAIR_WARPS) { 
-    FindWarpGroups ();
-    MARKTIME("setup warp groups: %f sec\n", dtime);
-    MakeStackIndex ();
-    MARKTIME("setup stack index: %f sec\n", dtime);
-    RepairWarpMeasuresOpenLogfile ();
-  }
 
   // load data from each region file, only use bright stars
@@ -128 +120 @@
     findMosaics (&catalog, 1, FALSE);
 
-    // update the detection coordinates using the new image parameters
-    if (REPAIR_WARPS) RepairWarpMeasures (&catalog);
-
     initMrel (&catalog, 1);
     setMrelFinal (&catalog, NULL, TRUE);
@@ -153 +142 @@
     if (VERBOSE) fprintf (stderr, "saving catalog %s\n", catalog.filename);
     
-    char history[128];
     struct timeval now;
     gettimeofday (&now, (void *) NULL);
     char *moddate = ohana_sec_to_date (now.tv_sec);
     gfits_modify (&catalog.header, "RELPHOT", "%s", 1, moddate);      
-    if (REPAIR_WARPS) {
-      snprintf (history, 128, "repair warp measure.imageID: %s", moddate);
-      gfits_modify_alt (&catalog.header, "HISTORY", "%S", 0, history); // adds a new entry
-    }
     free (moddate);
 
@@ -184 +168 @@
     freeMosaicBins (1, FALSE);
     freeGridBins ();
-  }
-
-  if (REPAIR_WARPS) {
-    FreeWarpGroups ();
-    FreeStackGroups ();
-    RepairWarpMeasuresCloseLogfile ();
   }
 
@@ -252 +230 @@
     if (RESET)             { strextend (&command, "-reset"); }
     if (RESET_ZEROPTS)     { strextend (&command, "-reset-zpts"); }
-    if (REPAIR_WARPS)      { strextend (&command, "-repair-warps"); }
     if (PRESERVE_PS1)      { strextend (&command, "-preserve-ps1"); }
     if (IS_DIFF_DB)        { strextend (&command, "-is-diff-db"); }