Changeset 37593

Timestamp:

Nov 12, 2014, 3:59:32 PM (12 years ago)

Author:

eugene

Message:

updates to relphot

Location:

branches/eam_branches/ipp-20140904/Ohana/src

Files:

• opihi/dvo/imlist.c (modified) (3 diffs)
• relphot/src/ImageTable.c (modified) (1 diff)
• relphot/src/MosaicOps.c (modified) (1 diff)
• relphot/src/assign_images.c (modified) (1 diff)
• relphot/src/reload_catalogs.c (modified) (1 diff)
• relphot/src/relphot_objects.c (modified) (1 diff)
• relphot/src/relphot_parallel_regions.c (modified) (1 diff)

branches/eam_branches/ipp-20140904/Ohana/src/opihi/dvo/imlist.c

@@ -38 +38 @@
   }
 
-  // int RegionSelect = FALSE;
-  // if ((N = get_argument (argc, argv, "-region"))) {
-  //   remove_argument (N, &argc, argv);
-  //   RegionSelect = TRUE;
-  // }
-
   PhotcodeValue = NULL;
   PhotcodeSelect = FALSE;
@@ -76 +70 @@
   }
 
+  int MAX_LIST = -1;
+  if ((N = get_argument (argc, argv, "-max-list"))) {
+    remove_argument (N, &argc, argv);
+    MAX_LIST = atoi (argv[N]);
+    remove_argument (N, &argc, argv);
+  }
+
   if (argc != 1) {
-    gprint (GP_ERR, "USAGE: image [-time start range] [-region] [-name string]\n");
+    gprint (GP_ERR, "USAGE: image [-time start range] [-region] [-name string] [-photcode code] [-Nphotcode N] [-max-list N]\n");
     return (FALSE);
   }
@@ -83 +84 @@
   if ((image = LoadImagesDVO (&Nimage)) == NULL) return (FALSE);
   image_subset (image, Nimage, &subset, &Nsubset, selection, tzero, trange, TimeSelect);
-  // BuildChipMatch (image, Nimage);
+  MAX_LIST = MAX_LIST < 0 ? Nsubset : MIN(MAX_LIST, Nsubset);
 
   GetTimeFormat (&TimeReference, &TimeFormat);
 
-  for (j = 0; j < Nsubset; j++) {
+  for (j = 0; j < MAX_LIST; j++) {
     i = subset[j];
     if (NameSelect && (strstr (image[i].name, name) == (char *) NULL)) continue;

branches/eam_branches/ipp-20140904/Ohana/src/relphot/src/ImageTable.c

@@ -32 +32 @@
   }
 
+  // XXX do not make the chip match -- we have not loaded the PHU entries
+  // BuildChipMatch (image, Nimage);
+
   *nimage = Nimage;
   return image;

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

@@ -620 +620 @@
       NY = image[m].NY;
       dS += hypot (image[m].coords.cdelt1*image[m].coords.pc1_1, image[m].coords.cdelt1*image[m].coords.pc2_1);
-      XY_to_RD (&R, &D, 0.0, 0.0, &image[m].coords);
+
+      OhanaProjection proj = GetProjection (image[m].coords.ctype);
+      if ((proj == PROJ_WRP) && !image[m].coords.mosaic) {
+        XY_to_LM (&R, &D, 0.0, 0.0, &image[m].coords);
+      } else {
+        XY_to_RD (&R, &D, 0.0, 0.0, &image[m].coords);
+      }
       Rmin = MIN (Rmin, R);
       Rmax = MAX (Rmax, R);
       Dmin = MIN (Dmin, D);
       Dmax = MAX (Dmax, D);
-      XY_to_RD (&R, &D, (double) NX, 0.0, &image[m].coords);
+
+      if ((proj == PROJ_WRP) && !image[m].coords.mosaic) {
+        XY_to_LM (&R, &D, (double) NX, 0.0, &image[m].coords);
+      } else {
+        XY_to_RD (&R, &D, (double) NX, 0.0, &image[m].coords);
+      }
       Rmin = MIN (Rmin, R);
       Rmax = MAX (Rmax, R);
       Dmin = MIN (Dmin, D);
       Dmax = MAX (Dmax, D);
-      XY_to_RD (&R, &D, (double) NX, (double) NY, &image[m].coords);
+
+      if ((proj == PROJ_WRP) && !image[m].coords.mosaic) {
+        XY_to_LM (&R, &D, (double) NX, (double) NY, &image[m].coords);
+      } else {
+        XY_to_RD (&R, &D, (double) NX, (double) NY, &image[m].coords);
+      }
       Rmin = MIN (Rmin, R);
       Rmax = MAX (Rmax, R);
       Dmin = MIN (Dmin, D);
       Dmax = MAX (Dmax, D);
-      XY_to_RD (&R, &D, 0.0, (double) NY, &image[m].coords);
+
+      if ((proj == PROJ_WRP) && !image[m].coords.mosaic) {
+        XY_to_LM (&R, &D, 0.0, (double) NY, &image[m].coords);
+      } else {
+        XY_to_RD (&R, &D, 0.0, (double) NY, &image[m].coords);
+      }
       Rmin = MIN (Rmin, R);
       Rmax = MAX (Rmax, R);

branches/eam_branches/ipp-20140904/Ohana/src/relphot/src/assign_images.c

@@ -117 +117 @@
 
     if (MOSAIC_ZEROPT) {
-      // use the coords of the associated mosaic to select
+      // use the coords of the associated mosaic to select (only for chips; stacks use their own center)
       Mosaic *mosaic = getMosaicForImage (j); 
-      Rc = mosaic->coords.crval1;
-      Dc = mosaic->coords.crval2;
-      // NOTE : have defined mosaic Rc,Dc to choose the side of 0,360 on which most of the
-      // chips are located.  but, for host assignment, we rationalize to 0.0 - 360.0
-      Rc = ohana_normalize_angle_to_midpoint (Rc, 180.0);
+      if (mosaic) {
+        Rc = mosaic->coords.crval1;
+        Dc = mosaic->coords.crval2;
+        // NOTE : have defined mosaic Rc,Dc to choose the side of 0,360 on which most of the
+        // chips are located.  but, for host assignment, we rationalize to 0.0 - 360.0
+        Rc = ohana_normalize_angle_to_midpoint (Rc, 180.0);
+      }
     }
 

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

@@ -165 +165 @@
     free (BOUNDARY_TREE);
     BOUNDARY_TREE = tmppath;
-    
   }
 

branches/eam_branches/ipp-20140904/Ohana/src/relphot/src/relphot_objects.c

@@ -36 +36 @@
     if (!HostTableTestHost(skylist[0].regions[i], hostID)) continue;
 
-    // set up the basic catalog info
     // set up the basic catalog info
     char hostfile[1024];

branches/eam_branches/ipp-20140904/Ohana/src/relphot/src/relphot_parallel_regions.c

@@ -42 +42 @@
   if (!dvo_image_load (&db, VERBOSE, FALSE)) Shutdown ("can't read image catalog %s", db.filename);
   MARKTIME("-- load image data: %f sec\n", dtime);
+
+  // save Images.dat using the copied structure
+  if (UPDATE_CATFORMAT) {
+    // ensure the db format is updated
+    db.format = dvo_catalog_catformat (UPDATE_CATFORMAT);
+  }
 
   /* assign the images to the different region hosts */