Changeset 34844 for trunk/Ohana/src/relphot

Timestamp:

Dec 18, 2012, 10:04:35 AM (14 years ago)

Author:

eugene

Message:

merging changes from eam_branches/ipp-20121130

Location:

trunk/Ohana

Files:

• . (modified) (1 prop)
• src/relphot/Makefile (modified) (2 diffs)
• src/relphot/include/relphot.h (modified) (4 diffs)
• src/relphot/src/BoundaryTreeOps.c (modified) (1 diff)
• src/relphot/src/ImageOps.c (modified) (2 diffs)
• src/relphot/src/StarOps.c (modified) (6 diffs)
• src/relphot/src/args.c (modified) (1 diff)
• src/relphot/src/setMrelCatalog.c (copied) (copied from branches/eam_branches/ipp-20121130/Ohana/src/relphot/src/setMrelCatalog.c )

trunk/Ohana/src/relphot/Makefile

@@ -49 +49 @@
 $(SRC)/setExclusions.$(ARCH).o   \
 $(SRC)/setMrelFinal.$(ARCH).o    \
+$(SRC)/setMrelCatalog.$(ARCH).o          \
 $(SRC)/BoundaryTreeOps.$(ARCH).o         \
 $(SRC)/write_coords.$(ARCH).o
@@ -78 +79 @@
 $(SRC)/setExclusions.$(ARCH).o   \
 $(SRC)/setMrelFinal.$(ARCH).o    \
+$(SRC)/setMrelCatalog.$(ARCH).o    \
 $(SRC)/BoundaryTreeOps.$(ARCH).o         \
 $(SRC)/write_coords.$(ARCH).o

trunk/Ohana/src/relphot/include/relphot.h

@@ -63 +63 @@
 
 typedef struct {
+  int Nfew;
+  int Ncode;
+  int Nsys;
+  int Nbad;
+  int Ncal;
+  int Nmos;
+  int Ngrid;
+
+  // NOTE: the following arrays are (possibly) pre-allocated and carried down to each
+  // thread.  The first 3 (list, dlist, wlist) are used in all relphot analyses; the
+  // others are only used on the final output steps.
+
+  double *list;               // list of measure.mag values for a given star
+  double *dlist;              // mag errors for a star
+  double *wlist;              // weights to use for mean mags
+  double *aplist;             // ap mags for a star
+  double *kronlist;           // kron mags for a star
+  double *dkronlist;          // kron mag errors 
+
+  double *psfqf_list;         // psfqf for all filters
+  double *psfqfperf_list;     // psfqfperf for all filters
+  double *stargal_list;       // stargal for all filters
+
+  StatType stats;
+  StatType apstats;
+  StatType kronstats;
+} SetMrelInfo;
+
+typedef struct {
   AverageTiny *average;       // array of (minimal) average data
   MeasureTiny *measure;       // array of (minimal) measure data 
@@ -113 +142 @@
 
 char        *BOUNDARY_TREE;
+
+int SET_MREL_VERSION;
 
 double MAG_LIM;
@@ -239 +270 @@
 Coords       *getCoords           PROTO((off_t meas, int cat));
 off_t         getImageEntry       PROTO((off_t meas, int cat));
+
+float         getMcal_alt         PROTO((off_t meas, int cat, FlatCorrectionTable *flatcorr, float Xccd, float Yccd));
 float         getMcal             PROTO((off_t meas, int cat, FlatCorrectionTable *flatcorr, Catalog *catalog));
 float         getMflat            PROTO((off_t meas, int cat, FlatCorrectionTable *flatcorr, Catalog *catalog));
@@ -348 +381 @@
 int load_tree (char *treefile);
 int BoundaryTreePrimaryCell (char *primaryCellName, double ra, double dec);
+
+int print_measure_set_alt (Average *average, SecFilt *secfilt, Measure *measure);
+int setMrel_catalog_alt (Catalog *catalog, int Nc, int pass, FlatCorrectionTable *flatcorr, SetMrelInfo *results, int Nsecfilt);
+int setMrelAverageExposure (off_t meas, int cat, int pass, FlatCorrectionTable *flatcorr, SetMrelInfo *results, Average *average, AverageTiny *averageT, SecFilt *secfilt, Measure *measure, MeasureTiny *measureT, off_t *found);
+int setMrelAverageStack (off_t meas, int cat, FlatCorrectionTable *flatcorr, SetMrelInfo *results, Average *average, SecFilt *secfilt, Measure *measure, char *primaryCell);
+int setGlobalObjStats (Average *average, Measure *measure);
+
+void SetMrelInfoInit (SetMrelInfo *results, int allocLists);

trunk/Ohana/src/relphot/src/BoundaryTreeOps.c

@@ -21 +21 @@
   }
   
+# define USE_PROJECTION_CELL 0
+# if (USE_PROJECTION_CELL)
   snprintf (primaryCellName, DVO_MAX_PATH, "RINGS.V3.%s", tree->name[zone][band]);
+# else
+
+  // I have ra, dec, and the primary projection cell.  In order to choose the primary skycell,
+  // I just need to project to ra,dec to X,Y based on the center of the cell and then get the subdivision right.
+    
+  double x = 0.0;
+  double y = 0.0;
+  BoundaryTreeProjection (&x, &y, ra, dec, tree, zone, band);
+  
+  int xi = x / tree->dX[zone][band];
+  int yi = y / tree->dY[zone][band];
+  int N = xi + tree->NX_SUB * yi;
+  
+  // XXX short-circuit this for now (we should use this code if we make tree have more variable NX,NY values
+  // char format[24], skycellname[128];
+  // int Ndigit = (int)(log10(tree->NX_SUB*tree->NY_SUB)) + 1 ;
+  // snprintf (format, 24, "%s.%%0%dd", tree->name[zone][band], Ndigit);
+  // snprintf (skycellname, 128, format, N);
+
+  snprintf (primaryCellName, DVO_MAX_PATH, "RINGS.V3.%s.%03d", tree->name[zone][band], N);
+# endif
+
   return TRUE;
 }

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

@@ -352 +352 @@
 
 // returns image.Mcal - ff(x,y)
+float getMcal_alt (off_t meas, int cat, FlatCorrectionTable *flatcorr, float Xccd, float Yccd) {
+
+  off_t i;
+  float value, offset;
+
+  i = MeasureToImage[cat][meas];
+  if (i == -1) return (NAN);
+
+  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;
+
+  return (value);
+}
+
+// returns image.Mcal - ff(x,y)
 short getUbercalDist (off_t meas, int cat) {
 
@@ -400 +423 @@
   if (i == -1) return FALSE;
 
-  // this is a bit crude: stack image names are of the form 
-  // RINGS.V3.skycell.1495.027.sky.191211.stk.988232.cmf 
-  // the primaryCell has a name of the form RINGS.V3.skycell.1495
+  // this is a bit crude: stack image names are of the form:
+  // RINGS.V3.skycell.1495.027.sky.191211.stk.988232.cmf.
+
+  // the primaryCell has a name of the form RINGS.V3.skycell.1495 or RINGS.V3.skycell.1495.027
+  // (if we use projection or skycell as the primary)
 
   if (!strncmp(image[i].name, name, strlen(name))) return TRUE;

trunk/Ohana/src/relphot/src/StarOps.c

@@ -2 +2 @@
 
 static int Nmax;
-
-typedef struct {
-  int Nfew;
-  int Ncode;
-  int Nsys;
-  int Nbad;
-  int Ncal;
-  int Nmos;
-  int Ngrid;
-
-  // NOTE: the following arrays are (possibly) pre-allocated and carried down to each
-  // thread.  The first 3 (list, dlist, wlist) are used in all relphot analyses; the
-  // others are only used on the final output steps.
-
-  double *list;               // list of measure.mag values for a given star
-  double *dlist;              // mag errors for a star
-  double *wlist;              // weights to use for mean mags
-  double *aplist;             // ap mags for a star
-  double *kronlist;           // kron mags for a star
-  double *dkronlist;          // kron mag errors 
-
-  double *psfqf_list;         // psfqf for all filters
-  double *psfqfperf_list;     // psfqfperf for all filters
-  double *stargal_list;       // stargal for all filters
-} SetMrelInfo;
 
 enum {THREAD_RUN, THREAD_DONE};
@@ -154 +129 @@
   for (i = 0; i < Ncatalog; i++) {
     // pass == -1 for anything other than the final pass
-    setMrel_catalog (catalog, i, -1, flatcorr, &results, Nsecfilt);
+    switch (SET_MREL_VERSION) {
+      case 0:
+        setMrel_catalog (catalog, i, -1, flatcorr, &results, Nsecfilt);
+        break;
+      case 1:
+        setMrel_catalog_alt (catalog, i, -1, flatcorr, &results, Nsecfilt);
+        break;
+      default:
+        fprintf (stderr, "invalid setMrel version %d (use 0 or 1)\n", SET_MREL_VERSION);
+        exit (2);
+    }
     SetMrelInfoAccum (&summary, &results);
   }
@@ -182 +167 @@
 
   for (i = 0; i < Ncatalog; i++) {
-    setMrel_catalog  (catalog, i, pass, flatcorr, &results, Nsecfilt); // XXX add arguments as needed for options
+    switch (SET_MREL_VERSION) {
+      case 0:
+        setMrel_catalog (catalog, i, pass, flatcorr, &results, Nsecfilt);
+        break;
+      case 1:
+        setMrel_catalog_alt (catalog, i, pass, flatcorr, &results, Nsecfilt);
+        break;
+      default:
+        fprintf (stderr, "invalid setMrel version %d (use 0 or 1)\n", SET_MREL_VERSION);
+        exit (2);
+    }
     SetMrelInfoAccum (&summary, &results);
   }
@@ -286 +281 @@
 
     // pass == -1 for anything other than the final pass
-    setMrel_catalog (catalog, i, -1, flatcorr, &results, Nsecfilt);
+    switch (SET_MREL_VERSION) {
+      case 0:
+        setMrel_catalog (catalog, i, -1, flatcorr, &results, Nsecfilt);
+        break;
+      case 1:
+        setMrel_catalog_alt (catalog, i, -1, flatcorr, &results, Nsecfilt);
+        break;
+      default:
+        fprintf (stderr, "invalid setMrel version %d (use 0 or 1)\n", SET_MREL_VERSION);
+        exit (2);
+    }
     SetMrelInfoAccum (&threadinfo->summary, &results);
   }
@@ -332 +337 @@
   liststats_setmode (&kronstats, STATMODE);
 
-  // StatType psfstats;
-  // liststats_setmode (&psfstats, "MEAN");
-
   double *list      = results->list;
   double *dlist     = results->dlist;
@@ -363 +365 @@
 
     if (isSetMrelFinal) {
+      // set the name of the primary skycell (this is used in a strcmp to match the skycells in stack detections)
       BoundaryTreePrimaryCell(primaryCell, catalog[Nc].average[j].R, catalog[Nc].average[j].D);
     }

trunk/Ohana/src/relphot/src/args.c

@@ -64 +64 @@
   }
 
+  SET_MREL_VERSION = 1;
+  if ((N = get_argument (argc, argv, "-set-mrel-version"))) {
+    remove_argument (N, &argc, argv);
+    SET_MREL_VERSION = atof(argv[N]);
+    remove_argument (N, &argc, argv);
+  }
+
   VERBOSE = VERBOSE2 = FALSE;
   if ((N = get_argument (argc, argv, "-v"))) {