Changeset 35872

Timestamp:

Aug 2, 2013, 10:44:32 AM (13 years ago)

Author:

eugene

Message:

handle small regions under nloop = 0

Location:

branches/eam_branches/ipp-20130711/Ohana/src/relphot

Files:

• include/relphot.h (modified) (1 diff)
• src/MosaicOps.c (modified) (1 diff)
• src/args.c (modified) (1 diff)
• src/reload_catalogs.c (modified) (1 diff)
• src/relphot_images.c (modified) (2 diffs)
• src/select_images.c (modified) (1 diff)

branches/eam_branches/ipp-20130711/Ohana/src/relphot/include/relphot.h

@@ -244 +244 @@
 
 int USE_BASIC_CHECK;
+int USE_FULL_OVERLAP;
 
 # ifdef GRID_V1

branches/eam_branches/ipp-20130711/Ohana/src/relphot/src/MosaicOps.c

@@ -302 +302 @@
     mosaic[j].Mcal  = 0.0;
     mosaic[j].dMcal = 0.0;
-    mosaic[j].dMsys = 0.0;
     mosaic[j].Xm    = 0.0;
-    mosaic[j].flags  = subset[i].flags;
+    mosaic[j].dMsys = subset[i].flags;
+    mosaic[j].flags = subset[i].flags;
     mosaic[j].secz  = subset[i].secz;
     mosaic[j].photcode = GetPhotcodeEquivCodebyCode (subset[i].photcode);

branches/eam_branches/ipp-20130711/Ohana/src/relphot/src/args.c

@@ -64 +64 @@
   }
 
+  USE_FULL_OVERLAP = TRUE;
+  if ((N = get_argument (argc, argv, "-sloppy-image-overlap"))) {
+    remove_argument (N, &argc, argv);
+    USE_FULL_OVERLAP = FALSE;
+  }
+
   SET_MREL_VERSION = 1;
   if ((N = get_argument (argc, argv, "-set-mrel-version"))) {

branches/eam_branches/ipp-20130711/Ohana/src/relphot/src/reload_catalogs.c

@@ -164 +164 @@
   }
 
-  int i;
+  int i, j;
   for (i = 0; i < table->Nhosts; i++) {
+
+    if (sky->Nregions < table->Nhosts) {
+      // do any of the regions want this host?
+      int wantThisHost = FALSE;
+      for (j = 0; j < sky->Nregions; j++) {
+        if (HostTableTestHost (sky->regions[j], table->hosts[i].hostID)) {
+          wantThisHost = TRUE;
+          break;
+        }
+      }
+      if (!wantThisHost) {
+        // fprintf (stderr, "skip host %s\n", table->hosts[i].hostname);
+        continue;
+      }
+    }
 
     // ensure that the paths are absolute path names

branches/eam_branches/ipp-20130711/Ohana/src/relphot/src/relphot_images.c

@@ -232 +232 @@
     freeGridBins (Ncatalog);
 
-  } // (NLOOP > 0) : this loop determines the offsets per chip 
+    // end of if (NLOOP > 0) block : this loop determines the offsets per chip 
+  } else { 
+    // If nloop == 0, the above pass is not performed, in which case
+    // the Mcal values passed to the mosaics are not returned to the images...
+    setMcalFinal (); // copy per-mosaic calibrations to the images
+  }
 
   reload_images (&db);
@@ -247 +252 @@
     db.format = dvo_catalog_catformat (UPDATE_CATFORMAT);
   }
-  dvo_image_update (&db, VERBOSE);
+  if (NLOOP > 0) {
+    // do not save changes if we did not make changes. 
+    dvo_image_update (&db, VERBOSE);
+  }
   dvo_image_unlock (&db); 
 

branches/eam_branches/ipp-20130711/Ohana/src/relphot/src/select_images.c

@@ -176 +176 @@
     // declination, the range of RA is limited by the actual catalog boundaries
     // check if this image is in range for the Dmax and Dmin locations
-
-    int iDecBandMin = (DminImage + 90.0) / dDecBand;
-    int iDecBandMax = (DmaxImage + 90.0) / dDecBand;
-
-    // the sky region RA is defined to be 0 - 360.0
-    if (RminImage < RminBand[iDecBandMin]) { 
-      if (VERBOSE2) fprintf (stderr, "skip image %s (%f,%f) on boundary\n", timage[i].name, 0.5*(RminImage + RmaxImage), 0.5*(DminImage + DmaxImage));
-      continue;
-    }
-    if (RminImage < RminBand[iDecBandMax]) {
-      if (VERBOSE2) fprintf (stderr, "skip image %s (%f,%f) on boundary\n", timage[i].name, 0.5*(RminImage + RmaxImage), 0.5*(DminImage + DmaxImage));
-      continue;
-    }
-    if (RmaxImage > RmaxBand[iDecBandMin]) {
-      if (VERBOSE2) fprintf (stderr, "skip image %s (%f,%f) on boundary\n", timage[i].name, 0.5*(RminImage + RmaxImage), 0.5*(DminImage + DmaxImage));
-      continue;
-    }
-    if (RmaxImage > RmaxBand[iDecBandMax]) {
-      if (VERBOSE2) fprintf (stderr, "skip image %s (%f,%f) on boundary\n", timage[i].name, 0.5*(RminImage + RmaxImage), 0.5*(DminImage + DmaxImage));
-      continue;
+    if (USE_FULL_OVERLAP && strcmp(&timage[i].coords.ctype[4], "-DIS")) {
+
+      int iDecBandMin = (DminImage + 90.0) / dDecBand;
+      int iDecBandMax = (DmaxImage + 90.0) / dDecBand;
+
+      // the sky region RA is defined to be 0 - 360.0
+      if (RminImage < RminBand[iDecBandMin]) { 
+        if (VERBOSE2) fprintf (stderr, "skip image %s (%f,%f) on boundary\n", timage[i].name, 0.5*(RminImage + RmaxImage), 0.5*(DminImage + DmaxImage));
+        continue;
+      }
+      if (RminImage < RminBand[iDecBandMax]) {
+        if (VERBOSE2) fprintf (stderr, "skip image %s (%f,%f) on boundary\n", timage[i].name, 0.5*(RminImage + RmaxImage), 0.5*(DminImage + DmaxImage));
+        continue;
+      }
+      if (RmaxImage > RmaxBand[iDecBandMin]) {
+        if (VERBOSE2) fprintf (stderr, "skip image %s (%f,%f) on boundary\n", timage[i].name, 0.5*(RminImage + RmaxImage), 0.5*(DminImage + DmaxImage));
+        continue;
+      }
+      if (RmaxImage > RmaxBand[iDecBandMax]) {
+        if (VERBOSE2) fprintf (stderr, "skip image %s (%f,%f) on boundary\n", timage[i].name, 0.5*(RminImage + RmaxImage), 0.5*(DminImage + DmaxImage));
+        continue;
+      }
     }