Changeset 14286

Timestamp:

Jul 18, 2007, 8:46:02 AM (19 years ago)

Author:

eugene

Message:

changing SetImageSelection API to take a bool mosaicMode

Location:

trunk/Ohana/src/opihi/dvo

Files:

• ImageSelection.c (modified) (3 diffs)
• calmextract.c (modified) (1 diff)
• dmagmeas.c (modified) (1 diff)

trunk/Ohana/src/opihi/dvo/ImageSelection.c

@@ -9 +9 @@
 
 /* load images based on parameters and region, etc */
-int SetImageSelection (int mode, int RegionSelect) {
+int SetImageSelection (int mosaicMode, int RegionSelect) {
 
   int Ngraph;
@@ -29 +29 @@
   TimeSelect = GetTimeSelection (&tzero, &tend);
 
-  switch (mode) {
-    case MEAS_XCCD:
-    case MEAS_YCCD:
-      break;
-    case MEAS_XMOSAIC: 
-    case MEAS_YMOSAIC:
+  if (mosaicMode) {
       /* mosaic defines a frame with 0,0 at the mosaic center, and 1 arcsec / pixel */
       mosaic.crpix1 = mosaic.crpix2 = 0.0;
@@ -42 +37 @@
       mosaic.Npolyterms = 0;
       strcpy (mosaic.ctype, "RA---SIN");
-      break;
-    default:
-      return (TRUE);
   }
 

trunk/Ohana/src/opihi/dvo/calmextract.c

@@ -69 +69 @@
   /* load region corresponding to selection above */
   if ((skylist = SelectRegions (RegionName, RegionList)) == NULL) goto escape;
-  if (!SetImageSelection (MEAS_XMOSAIC, ((RegionName == NULL) && (RegionList == NULL)))) goto escape;
+  if (!SetImageSelection (TRUE, ((RegionName == NULL) && (RegionList == NULL)))) goto escape;
 
   for (Nr = 0; Nr < skylist[0].Nregions; Nr++) {

trunk/Ohana/src/opihi/dvo/dmagmeas.c

@@ -48 +48 @@
   /* load region corresponding to selection above */
   if ((skylist = SelectRegions (RegionName, RegionList)) == NULL) goto escape;
-  if (!SetImageSelection (param, ((RegionName == NULL) && (RegionList == NULL)))) goto escape;
+  if (!SetImageSelection (((param == MEAS_XMOSAIC) || (param == MEAS_YMOSAIC)), ((RegionName == NULL) && (RegionList == NULL)))) goto escape;
 
   /* init vectors to save data */