Changeset 39289 for trunk

Timestamp:

Dec 17, 2015, 8:56:07 PM (11 years ago)

Author:

eugene

Message:

do not load flatcorr.fits; use measure.Mflat for static flat component

Location:

trunk/Ohana/src/relphot/src

Files:

• ImageOps.c (modified) (5 diffs)
• relphot_client.c (modified) (1 diff)
• relphot_images.c (modified) (1 diff)
• relphot_parallel_images.c (modified) (1 diff)
• relphot_parallel_regions.c (modified) (1 diff)

trunk/Ohana/src/relphot/src/ImageOps.c

@@ -410 +410 @@
 }
 
-// returns image.Mcal - ff(x,y)
+// returns image.Mcal
+// NOTE: static flat-field component is included in measure.Mflat
 float getMcal (off_t meas, int cat, FlatCorrectionTable *flatcorr, Catalog *catalog) {
 
   off_t i;
-  float value, offset;
+  float value;
 
   i = MeasureToImage[cat][meas];
@@ -421 +422 @@
   if (image[i].flags & IMAGE_BAD) return (NAN);  
   value = image[i].Mcal;
-  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);
-  }
-  value -= offset;
+  // int flat_id = image[i].photom_map_id;
+  // float offset = 0.0;
+  // if (flat_id) {
+  //   offset = FlatCorrectionOffset (flatcorr, flat_id, catalog[cat].measureT[meas].Xccd, catalog[cat].measureT[meas].Yccd);
+  // }
+  // value -= offset;
 
   return (value);
@@ -434 +435 @@
 
 // returns image.Mcal - ff(x,y)
+// NOTE: static flat-field component is included in measure.Mflat
 float getMcal_alt (off_t meas, int cat, FlatCorrectionTable *flatcorr, float Xccd, float Yccd) {
 
   off_t i;
-  float value, offset;
+  float value;
 
   i = MeasureToImage[cat][meas];
@@ -444 +446 @@
   if (image[i].flags & IMAGE_BAD) return (NAN);  
   value = image[i].Mcal;
-  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, Xccd, Yccd);
-  }
-  value -= offset;
+  // int flat_id = image[i].photom_map_id;
+  // float offset = 0.0;
+  // if (flat_id) {
+  //   offset = FlatCorrectionOffset (flatcorr, flat_id, Xccd, Yccd);
+  // }
+  // value -= offset;
 
   return (value);
@@ -564 +566 @@
   if (i == -1) return (NAN);
 
-  float offset = 0.0;
+  float offset = catalog[cat].measureT[meas].Mflat;
+  if (!isfinite(offset)) {
+    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);
-  }
+  // 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);

trunk/Ohana/src/relphot/src/relphot_client.c

@@ -72 +72 @@
 
       // load the flat-field correction table from CATDIR
+# if (0)
       char flatcorrFile[1024];
       snprintf (flatcorrFile, 1024, "%s/flatcorr.fits", CATDIR);
       FlatCorrectionTable *flatcorr = FlatCorrectionLoad (flatcorrFile, VERBOSE);
       client_logger_message ("loaded flat-field correction data\n");
-
+# endif
+      FlatCorrectionTable *flatcorr = NULL;
       reload_catalogs (skylist, flatcorr, HOST_ID, HOSTDIR);
       client_logger_message ("updated catalogs\n");

trunk/Ohana/src/relphot/src/relphot_images.c

@@ -47 +47 @@
 
   // load the flat correction table (if defined)
+# if (0)
   char flatcorrfile[256];
   sprintf (flatcorrfile, "%s/flatcorr.fits", CATDIR);
   FlatCorrectionTable *flatcorr = FlatCorrectionLoad (flatcorrfile, VERBOSE);
+# endif
+  FlatCorrectionTable *flatcorr = NULL;
 
   if (NLOOP > 0) {

trunk/Ohana/src/relphot/src/relphot_parallel_images.c

@@ -44 +44 @@
 
   // load the flat correction table (if defined)
+# if (0)
   char flatcorrfile[256];
   sprintf (flatcorrfile, "%s/flatcorr.fits", CATDIR);
   FlatCorrectionTable *flatcorr = FlatCorrectionLoad (flatcorrfile, VERBOSE);
+# endif
+  FlatCorrectionTable *flatcorr = NULL;
 
   SkyTable *sky = SkyTableLoadOptimal (CATDIR, SKY_TABLE, GSCFILE, TRUE, SKY_DEPTH, VERBOSE);

trunk/Ohana/src/relphot/src/relphot_parallel_regions.c

@@ -17 +17 @@
 
   // load the flat correction table (if defined)
+# if (0)
   char flatcorrfile[256];
   sprintf (flatcorrfile, "%s/flatcorr.fits", CATDIR);
   FlatCorrectionTable *flatcorr = FlatCorrectionLoad (flatcorrfile, VERBOSE);
+# endif
+  FlatCorrectionTable *flatcorr = NULL;
 
   // register database handle with shutdown procedure