Changeset 41422 for trunk/Ohana/src/libdvo

Timestamp:

Sep 24, 2020, 2:44:55 PM (6 years ago)

Author:

eugene

Message:

rename libfits byte-type to gfbyte to avoid collisions

Location:

trunk/Ohana/src/libdvo/src

Files:

• skyregion_gsc.c (modified) (4 diffs)
• skyregion_io.c (modified) (1 diff)

trunk/Ohana/src/libdvo/src/skyregion_gsc.c

@@ -33 +33 @@
 void SkyTableL3fromL2 (SkyRegion *L2, SkyTable *L3, SkyTable *L4, SkyTable *band, int Ns, int Ne);
 void SkyTableL4fromL3 (SkyRegion *L3, SkyTable *L4);
+void SkyTableL5fromL4 (SkyRegion *L4, SkyTable *L5);
 
 void SkyTableSort (SkyTable *table);
@@ -170 +171 @@
   SkyTableAppend (skytable, &L2, skytable[0].Nregions - L1.Nregions);
   SkyTableAppend (skytable, &L3, skytable[0].Nregions - L2.Nregions);
+
+  // XXX TEST : for L4 entries in a certain ra,dec range, generate L5 entries:
+
+  SkyTable L5; 
+  L5.Nregions = 0;
+  L5.Nalloc   = 1000;
+  ALLOCATE (L5.regions, SkyRegion, L5.Nalloc);
+
+  for (i = 0; i < L4.Nregions; i++) {
+    // only work on a specific square region:
+    if (L4.regions[i].Rmin <  9.5) continue;
+    if (L4.regions[i].Rmin > 10.5) continue;
+    if (L4.regions[i].Dmin < 40.0) continue;
+    if (L4.regions[i].Dmin > 42.0) continue;
+    
+    SkyTableL5fromL4 (&L4.regions[i], &L5);
+  }
+
   SkyTableAppend (skytable, &L4, skytable[0].Nregions - L3.Nregions);
+
+  SkyTableAppend (skytable, &L5, skytable[0].Nregions - L4.Nregions);
+  free (L5.regions);
 
   free (L0.regions);
@@ -543 +565 @@
 }
 
+// append new regions on to the supplied L5 list (may be empty)
+void SkyTableL5fromL4 (SkyRegion *L4, SkyTable *L5) {
+
+  int nx, ny, Nr, Nbox;
+  double Rmin, Dmin, dR, dD;
+  char name[80];
+
+  Nr = L5[0].Nregions;
+  L5[0].Nregions += NDIV*NDIV;
+  CHECK_REALLOCATE (L5[0].regions, SkyRegion, L5[0].Nalloc, L5[0].Nregions, 0.5*L5[0].Nalloc);
+
+  L4[0].child  = TRUE;
+  L4[0].childS = Nr;
+  L4[0].childE = L5[0].Nregions;
+
+  // XXX handle the pole regions just a bit differently...
+
+  /* subdivide L4 into NDIV boxes */
+  Rmin = L4[0].Rmin;
+  Dmin = L4[0].Dmin;
+  dR = (L4[0].Rmax - L4[0].Rmin) / NDIV;
+  dD = (L4[0].Dmax - L4[0].Dmin) / NDIV;
+
+  Nbox = 0;
+  for (ny = 0; ny < NDIV; ny ++) {
+    for (nx = 0; nx < NDIV; nx ++) {
+      L5[0].regions[Nr].Rmin     = Rmin  + (nx + 0)*dR;
+      L5[0].regions[Nr].Rmax     = Rmin  + (nx + 1)*dR;
+      L5[0].regions[Nr].Dmin     = Dmin + (ny + 0)*dD;
+      L5[0].regions[Nr].Dmax     = Dmin + (ny + 1)*dD;
+
+      L5[0].regions[Nr].index    =  Nr;
+      L5[0].regions[Nr].depth    =  5;
+      L5[0].regions[Nr].table    =  -1;
+      L5[0].regions[Nr].parent   =  L4[0].index;
+      L5[0].regions[Nr].child    =  FALSE;
+      L5[0].regions[Nr].childS   =  0;
+      L5[0].regions[Nr].childE   =  0;
+      L5[0].regions[Nr].hostFlags = 0;
+      L5[0].regions[Nr].hostID    = 0;
+      L5[0].regions[Nr].backupID  = 0;
+
+      myAssert (snprintf (name, 80, "%s.%02d", L4[0].name, Nbox) < 80, "overflow");
+      strcpy (L5[0].regions[Nr].name, name);
+      if (DEBUG >= 4) SkyRegionPrint (&L5[0].regions[Nr]);
+
+      Nr ++;
+      Nbox ++;
+    }
+  }
+  return;
+}
+
 // memory neutral
 void SkyTableAppend (SkyTable *old, SkyTable *new, int Nprev) {
@@ -571 +646 @@
   int i;
 
-  fprintf (stderr, "L%d:", region[0].depth);
+  fprintf (stderr, "L%d:", (int) region[0].depth);
   for (i = 0; i < region[0].depth; i++) {
     fprintf (stderr, " ");

trunk/Ohana/src/libdvo/src/skyregion_io.c

@@ -121 +121 @@
 }
 
+// load the skytable from the best location:
+// 1) if we already have a defined catdir with skytable.fits, use that
+// 2) in some cases, user may supply 'SKYFILE' with explicit path (this is not really used)
+// 3) if a file does not exist, create a new skytable from the GSC reference
+//    the GSC reference file contains a hard-code list of region names
+//    and boundaries.
+
 SkyTable *SkyTableLoadOptimal (char *catdir, char *skyfile, char *gscfile, int readwrite, int depth, int verbose) {