Changeset 36990

Timestamp:

Jul 10, 2014, 12:05:21 PM (12 years ago)

Author:

eugene

Message:

move gpc1-based photcode tests to specfic functions; do not remove mean Mcal from image.Mcal in relphot_parallel_region (mosaic values are not passed to remote clients)

Location:

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

Files:

• Makefile (modified) (2 diffs)
• doc/mosaic.txt (modified) (1 diff)
• include/relphot.h (modified) (3 diffs)
• src/ImageOps.c (modified) (9 diffs)
• src/MosaicOps.c (modified) (31 diffs)
• src/Shutdown.c (modified) (1 diff)
• src/assign_images.c (modified) (1 diff)
• src/extra.c (added)
• src/launch_region_hosts.c (modified) (1 diff)
• src/relphot_parallel_images.c (modified) (1 diff)
• src/setMrelCatalog.c (modified) (3 diffs)

branches/eam_branches/ipp-20140610/Ohana/src/relphot/Makefile

@@ -34 +34 @@
 $(SRC)/args.$(ARCH).o            \
 $(SRC)/help.$(ARCH).o            \
+$(SRC)/extra.$(ARCH).o           \
 $(SRC)/bcatalog.$(ARCH).o        \
 $(SRC)/global_stats.$(ARCH).o    \
@@ -82 +83 @@
 $(SRC)/args.$(ARCH).o            \
 $(SRC)/help.$(ARCH).o            \
+$(SRC)/extra.$(ARCH).o           \
 $(SRC)/synthetic_mags.$(ARCH).o  \
 $(SRC)/plotstuff.$(ARCH).o       \

branches/eam_branches/ipp-20140610/Ohana/src/relphot/doc/mosaic.txt

@@ +1 @@
+
+
+2014.07.09
+
+* trying to make sense of mosaic.Mcal vs image.Mcal in the context of UBERCAL:
+
+  * relphot_images:
+    * load_images (convert raw FITS table to Image structure, select subset matching selection)
+      * initMosaics (associate mosaics to images (gpc1 photcodes only))
+        * initMosaicGrid (define spatial range of mosaics [only used by grid analysis]; set Mcal to <image.Mcal> and image.Mcal to 0.0)
+    --- calculate image or mosaic Mcal values
+    * setMcalFinal (set image.Mcal = mosaicMcal)
+
+  * relphot_parallel_regions:
+    * assign_images
+      * makeMosaics (equivalent to initMosaics, but works on full image table, not subset)
+      * setMosaicCenters (set Mcal to <image.Mcal> and image.Mcal to 0.0) <--- this is wrong!
+      (sends images ONLY, not mosaics, to remote machines)
+      (slurps back new image values, applies to db)
+      
+  * relphot_parallel_images:
+    * makeMosaics (associate mosaics to images, gpc1 photcodes only)
+      * initMosaicGrid (needed in this one)
+---
 
 For 'mosaic' zero points, I define the mosaics by grouping the images

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

@@ -48 +48 @@
   float dMsys;
   unsigned short nFitPhotom;
-  float Xm;
+  short Xm;
   float secz;
   float ubercalDist;
@@ -317 +317 @@
 int           findMosaics         PROTO((Catalog *catalog, int Ncatalog, int doMosaicList));
 
-void makeMosaics (Image *image, off_t Nimage);
+void makeMosaics (Image *image, off_t Nimage, int mergeMcal);
 Mosaic *getMosaicForImage (off_t im);
 void setMosaicCenters (Image *image, off_t Nimage);
@@ -509 +509 @@
 int relphot_parallel_images ();
 int relphot_parallel_regions ();
+
+// in extra.c
+int isGPC1chip  (int photcode);
+int isGPC1stack (int photcode);
+int isGPC1warp  (int photcode);
+
+

branches/eam_branches/ipp-20140610/Ohana/src/relphot/src/ImageOps.c

@@ -532 +532 @@
 
   // FREEZE_IMAGES only applies to mosaic data (eg, gpc1)
-  // skip this function if photcode is gpc1 and FREEZE_IMAGES
-  // otherwise, allow image to be calibrated
-  // if (FREEZE_IMAGES) return;
 
   fprintf (stderr, "limiting negative clouds to %f\n", CLOUD_TOLERANCE);
@@ -565 +562 @@
     }      
 
-    int isGPC1cam = ((image[i].photcode >= 10000) && (image[i].photcode <= 10500));
-    if (FREEZE_IMAGES && isGPC1cam) continue;
+    if (FREEZE_IMAGES && isGPC1chip(image[i].photcode)) continue;
 
     // UBERCAL image: if this is an ubercal image, set minUbercalDist to 0:
@@ -713 +709 @@
     if (image[i].flags & IMAGE_BAD) continue;
 
-    int isGPC1cam = ((image[i].photcode >= 10000) && (image[i].photcode <= 10500));
-    if (FREEZE_IMAGES && isGPC1cam) continue;
+    if (FREEZE_IMAGES && isGPC1chip(image[i].photcode)) continue;
 
     mlist[N] = image[i].Mcal;
@@ -825 +820 @@
   for (i = 0; i < Nimage; i++) {
 
-    int isGPC1cam = ((image[i].photcode >= 10000) && (image[i].photcode <= 10500));
-    if (FREEZE_IMAGES && isGPC1cam) continue;
+    if (FREEZE_IMAGES && isGPC1chip(image[i].photcode)) continue;
 
     Mlist[Nplot] = image[i].Mcal;
@@ -873 +867 @@
 
   for (i = 0; i < Nimage; i++) {
-    int isGPC1cam = ((image[i].photcode >= 10000) && (image[i].photcode <= 10500));
-    if (FREEZE_IMAGES && isGPC1cam) continue;
+    if (FREEZE_IMAGES && isGPC1chip(image[i].photcode)) continue;
+
     bin = image[i].dMcal / 0.00025;
     bin = MAX (0, MIN (NBIN - 1, bin));
@@ -910 +904 @@
     if (image[i].flags & IMAGE_BAD)  continue;
 
-    int isGPC1cam = ((image[i].photcode >= 10000) && (image[i].photcode <= 10500));
-    if (FREEZE_IMAGES && isGPC1cam) continue;
+    if (FREEZE_IMAGES && isGPC1chip(image[i].photcode)) continue;
 
     N = 0;
@@ -957 +950 @@
     if (image[i].flags & IMAGE_BAD)  continue;
 
-    int isGPC1cam = ((image[i].photcode >= 10000) && (image[i].photcode <= 10500));
-    if (FREEZE_IMAGES && isGPC1cam) continue;
+    if (FREEZE_IMAGES && isGPC1chip(image[i].photcode)) continue;
 
     list[n] = pow (10.0, 0.01*image[i].Xm);
@@ -990 +982 @@
     if (image[i].flags & IMAGE_BAD)  continue;
 
-    int isGPC1cam = ((image[i].photcode >= 10000) && (image[i].photcode <= 10500));
-    if (FREEZE_IMAGES && isGPC1cam) continue;
+    if (FREEZE_IMAGES && isGPC1chip(image[i].photcode)) continue;
 
     list[n] = image[i].Mcal;
@@ -1023 +1014 @@
     if (image[i].flags & IMAGE_BAD)  continue;
 
-    int isGPC1cam = ((image[i].photcode >= 10000) && (image[i].photcode <= 10500));
-    if (FREEZE_IMAGES && isGPC1cam) continue;
+    if (FREEZE_IMAGES && isGPC1chip(image[i].photcode)) continue;
 
     list[n] = image[i].dMcal;

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

@@ -1 +1 @@
 # include "relphot.h"
 void plot_setMcal (double *list, int Npts, StatType *stats, float clouds);
+off_t findMosaic (unsigned int *startTimes, off_t Nmosaic, unsigned int start);
 
 // see discussion in ImagesOps.c re: IDX_T
@@ -36 +37 @@
 // MosaicN_image was 'Nimlist'
 // MosaicToImage was 'imlist'
+
+void sort_times (unsigned int *T, int N) {
+
+# define SWAPFUNC(A,B){ unsigned int tmp; \
+  tmp = T[A]; T[A] = T[B]; T[B] = tmp; \
+}
+# define COMPARE(A,B)(T[A] < T[B])
+
+  OHANA_SORT (N, COMPARE, SWAPFUNC);
+
+# undef SWAPFUNC
+# undef COMPARE
+
+}
 
 /* find mosaic frames (unique time periods & photcode name matches mosaic) */
@@ -136 +151 @@
 }
 
-off_t findMosaic (unsigned int *startTimes, off_t Nmosaic, unsigned int start);
-
-void sort_times (unsigned int *T, int N) {
-
-# define SWAPFUNC(A,B){ unsigned int tmp; \
-  tmp = T[A]; T[A] = T[B]; T[B] = tmp; \
-}
-# define COMPARE(A,B)(T[A] < T[B])
-
-  OHANA_SORT (N, COMPARE, SWAPFUNC);
-
-# undef SWAPFUNC
-# undef COMPARE
-
-}
-
 /* find mosaic frames (unique time periods) (NOTE : we do NOT require matching photcodes...)
    this function will also identify the images NOT in the subset which belong to a selected mosaic
@@ -157 +156 @@
 void initMosaics (Image *subset, off_t Nsubset, Image *image, char *inSubset, off_t Nimage) {
 
-  off_t i, j, status, found, NMOSAIC, *MosaicN_IMAGE;
+  off_t i, j, found, NMOSAIC, *MosaicN_IMAGE;
   unsigned int start, stop, *startTimes, *startTimesMosaic;
-  char *pname;
 
   if (!MOSAIC_ZEROPT) return;
@@ -174 +172 @@
   int Nmoschip = 0;
   for (i = 0; i < Nsubset; i++) {
-    int isGPC1cam = ((subset[i].photcode >= 10000) && (subset[i].photcode <= 10500));
-    if (!isGPC1cam) {
-      continue;
-    }
+    if (!isGPC1chip(subset[i].photcode)) continue;
     startTimes[Nmoschip] = subset[i].tzero;
     Nmoschip ++;
@@ -191 +186 @@
   // generate a list of the unique start times (these define the mosaics)
   for (i = 0; i < Nmoschip; i++) {
-    if (startTimes[i] < startTimesMosaic[Nmosaic]) {
-      fprintf (stderr, "error?\n");
-      abort();
-    }
+    myAssert (startTimes[i] >= startTimesMosaic[Nmosaic], "times out of order?");
     if (startTimes[i] == startTimesMosaic[Nmosaic]) continue;
     Nmosaic ++;
@@ -221 +213 @@
     mosaic[i].dMcal    = 0.0;
     mosaic[i].dMsys    = 0.0;
-    mosaic[i].Xm   = 0.0;
+    mosaic[i].Xm       = 0.0;
     mosaic[i].flags    = 0;
     mosaic[i].secz     = NAN;
@@ -244 +236 @@
     }
     
-    // this is gpc1-specific.  needs a more general solution
-    int isGPC1cam = ((image[i].photcode >= 10000) && (image[i].photcode <= 10500));
-    if (!isGPC1cam) {
-      continue;
-    }
-
-    if (0) {
-      // XXX this version fails if we have stack and fforce data: GPC1.g.SkyChip
-      /* select valid mosaic images by photcode */
-      pname = GetPhotcodeNamebyCode (image[i].photcode);
-      if (!pname) continue;
-      status = strncmp (pname, MOSAICNAME, strlen (MOSAICNAME));
-      if (status) continue;
-    }
+    if (!isGPC1chip(image[i].photcode)) continue;
 
     /* set image time range */
@@ -281 +260 @@
     ImageToMosaic[i] = -1;
 
-    // this is gpc1-specific.  needs a more general solution
-    int isGPC1cam = ((subset[i].photcode >= 10000) && (subset[i].photcode <= 10500));
-    if (!isGPC1cam) {
+    if (!isGPC1chip(subset[i].photcode)) {
       Nsimple ++;
       continue;
-    }
-
-    if (0) {
-      // XXX this version fails if we have stack and fforce data: GPC1.g.SkyChip
-      /* select valid mosaic images by photcode */
-      pname = GetPhotcodeNamebyCode (subset[i].photcode);
-      status = strncmp (pname, MOSAICNAME, strlen (MOSAICNAME));
-      if (status) continue;
     }
 
@@ -325 +294 @@
       abort();
     }
-    mosaic[j].stop  = stop;
-    mosaic[j].Mcal  = 0.0;
-    mosaic[j].dMcal = 0.0;
-    mosaic[j].Xm = 0.0;
-    mosaic[j].dMsys = subset[i].flags;
-    mosaic[j].flags = subset[i].flags;
-    mosaic[j].secz  = subset[i].secz;
+    mosaic[j].stop     = stop;
+    mosaic[j].Mcal     = 0.0;
+    mosaic[j].dMcal    = 0.0;
+    mosaic[j].Xm       = 0.0;
+    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);
   }
@@ -346 +315 @@
 }
 
-/* find mosaic frames (unique time periods) (NOTE : we do NOT require matching photcodes but we 
-   match images by MOSAICNAME.  this last point is weak: it forces a single camera at a time.
-   we can extend the logic to multiple cameras if we make list of MOSAICNAMES (better to assign a camera ID)
+/* find mosaic frames (unique time periods) (NOTE : require gpc1 chips, which is pretty limiting)
+   if mergeMcal is TRUE, <image.Mcal> values will be saved on Mosaic.Mcal
  */
-void makeMosaics (Image *image, off_t Nimage) {
-
-  off_t i, j, status, found, NMOSAIC, *MosaicN_IMAGE;
+void makeMosaics (Image *image, off_t Nimage, int mergeMcal) {
+
+  off_t i, j, found, NMOSAIC, *MosaicN_IMAGE;
   unsigned int start, stop, *startTimes, *startTimesMosaic;
-  char *pname;
 
   if (!MOSAIC_ZEROPT) return;
@@ -367 +334 @@
   // generate a list of all image start times
   ALLOCATE (startTimes, unsigned int, Nimage);
+  int Nmoschip = 0;
   for (i = 0; i < Nimage; i++) {
-    startTimes[i] = image[i].tzero;
-  }
-  sort_times (startTimes, Nimage);
+    if (!isGPC1chip(image[i].photcode)) continue;
+    startTimes[Nmoschip] = image[i].tzero;
+    Nmoschip ++;
+  }
+  sort_times (startTimes, Nmoschip);
   MARKTIME("create array of all image obstimes: %f sec\n", dtime);
   
@@ -379 +349 @@
 
   // generate a list of the unique start times (these define the mosaics)
-  for (i = 0; i < Nimage; i++) {
-    if (startTimes[i] < startTimesMosaic[Nmosaic]) {
-      fprintf (stderr, "error?\n");
-      abort();
-    }
+  for (i = 0; i < Nmoschip; i++) {
+    myAssert (startTimes[i] >= startTimesMosaic[Nmosaic], "times out of order?");
     if (startTimes[i] == startTimesMosaic[Nmosaic]) continue;
     Nmosaic ++;
@@ -405 +372 @@
   // init the mosaic array values
   for (i = 0; i < Nmosaic; i++) {
-    mosaic[i].start = startTimesMosaic[i];
-    mosaic[i].stop  = 0;
-    mosaic[i].Mcal  = 0.0;
-    mosaic[i].dMcal = 0.0;
-    mosaic[i].dMsys = 0.0;
-    mosaic[i].Xm    = 0.0;
-    mosaic[i].flags = 0;
-    mosaic[i].secz  = NAN;
+    mosaic[i].start    = startTimesMosaic[i];
+    mosaic[i].stop     = 0;
+    mosaic[i].Mcal     = 0.0;
+    mosaic[i].dMcal    = 0.0;
+    mosaic[i].dMsys    = 0.0;
+    mosaic[i].Xm       = 0.0;
+    mosaic[i].flags    = 0;
+    mosaic[i].secz     = NAN;
     mosaic[i].photcode = 0;
-    mosaic[i].skipCal = FALSE;
+    mosaic[i].skipCal  = FALSE;
     
     memset (&mosaic[i].coords, 0, sizeof(Coords));
@@ -427 +394 @@
 
   // assign each image to a mosaic
+  int Nsimple = 0;
   for (i = 0; i < Nimage; i++) {
     ImageToMosaic[i] = -1;
 
-    /* select valid mosaic images by photcode */
-    pname = GetPhotcodeNamebyCode (image[i].photcode);
-    if (!pname) continue;
-
-    status = strncmp (pname, MOSAICNAME, strlen (MOSAICNAME));
-    if (status) continue;
+    if (!isGPC1chip(image[i].photcode)) {
+      Nsimple ++;
+      continue;
+    }
 
     start = image[i].tzero;
@@ -466 +432 @@
       abort();
     }
-    mosaic[j].stop  = stop;
-    mosaic[j].Mcal  = 0.0;
-    mosaic[j].dMcal = 0.0;
-    mosaic[j].Xm    = 0.0;
-    mosaic[j].dMsys = image[i].flags;
-    mosaic[j].flags = image[i].flags;
-    mosaic[j].secz  = image[i].secz;
+    mosaic[j].stop     = stop;
+    mosaic[j].Mcal     = 0.0;
+    mosaic[j].dMcal    = 0.0;
+    mosaic[j].Xm       = 0.0;
+    mosaic[j].dMsys    = image[i].flags;
+    mosaic[j].flags    = image[i].flags;
+    mosaic[j].secz     = image[i].secz;
     mosaic[j].photcode = GetPhotcodeEquivCodebyCode (image[i].photcode);
   }
@@ -482 +448 @@
   free (startTimesMosaic);
 
+  if (mergeMcal) {
+    initMosaicGrid (image, Nimage);
+  }
+
   fprintf (stderr, "matched %d images to %d mosaics\n", (int) Nimage, (int) Nmosaic);
-
   return;
 }
@@ -539 +508 @@
   off_t i, j, m, NX, NY, NC, Nc;
   double R, D, Rmid, Dmid;
-  double Mcal, dMcal, Xm;
   double *Rc, *Dc;
 
@@ -549 +517 @@
     Nc = 0;
     Rmid = Dmid = NAN;
-    Mcal = dMcal = Xm = 0;
     for (j = 0; j < MosaicN_Image[i]; j++) {
       m = MosaicToImage[i][j];
@@ -589 +556 @@
         REALLOCATE (Dc, double, NC);
       }
-
-      Mcal  += image[m].Mcal;
-      dMcal += image[m].dMcal;
-      Xm    += image[m].Xm;
-
-      // for ubercal images, we (elsewhere) keep Mcal frozen
-
-      /* we are using mosaic.Mcal, not image.Mcal. reset image.Mcal */
-      image[m].Mcal  = 0.0;
-      image[m].dMcal = NAN;
-      image[m].Xm    = NAN_S_SHORT;
     }
 
@@ -643 +599 @@
     mosaic[i].coords.pc2_1  = 0.0;
 
-    mosaic[i].Mcal   = Mcal / MosaicN_Image[i];
-    mosaic[i].dMcal  = dMcal / MosaicN_Image[i];
-    mosaic[i].Xm = Xm / MosaicN_Image[i];
+    mosaic[i].Mcal   = 0.0;
+    mosaic[i].dMcal  = 0.0;
+    mosaic[i].Xm     = 0.0;
   }
   return;
@@ -661 +617 @@
   double R, D, Rmin, Rmax, Dmin, Dmax;
   double Mcal, dMcal, Xm;
+
+  fprintf (stderr, "*** moving Mcal from image.Mcal to mosaic.Mcal ***\n");
 
   dXmax = dYmax = 0.0;
@@ -693 +651 @@
       Dmin = MIN (Dmin, D);
       Dmax = MAX (Dmax, D);
+
+      /* we are using mosaic.Mcal, not image.Mcal. reset image.Mcal */
+
+      // XXX: how does this work with UBERCAL?  We want to keep the Mcal values supplied by ubercal, but 
+      // solve for a single offset for each exposure (Mosaic.Mcal).  
+      // we also want to keep the flat-field terms for each exposure (regardless of ubercal or not)
+      // if it helps, note that ubercal uses a single zp per exposure, so the mean of those values is the same as the value
+
       Mcal  += image[m].Mcal;
       dMcal += image[m].dMcal;
       Xm    += image[m].Xm;
 
-      // XXX: how does this work with UBERCAL?  We want to keep the Mcal values supplied by ubercal, but 
-      // solve for a single offset for each exposure (Mosaic.Mcal).  
-
-      // we also want to keep the flat-field terms for each exposure (regardless of ubercal or not)
-
-      // if it helps, note that ubercal uses a single zp per exposure, so the mean of those values is the same as the value
-
-      /* we are using mosaic.Mcal, not image.Mcal. reset image.Mcal */
       image[m].Mcal   = 0.0;
       image[m].dMcal  = NAN;
-      image[m].Xm = NAN_S_SHORT;
+      image[m].Xm     = NAN_S_SHORT;
     }
     dS /= MosaicN_Image[i];
@@ -725 +683 @@
     mosaic[i].Mcal   = Mcal / MosaicN_Image[i];
     mosaic[i].dMcal  = dMcal / MosaicN_Image[i];
-    mosaic[i].Xm = Xm / MosaicN_Image[i];
+    mosaic[i].Xm     = Xm / MosaicN_Image[i];
   }
   if (!USE_GRID) return;
@@ -735 +693 @@
 }
 
-// XXX : what about mosaics with skipCal == TRUE?
 void setMcalFinal () {
 
@@ -745 +702 @@
   image = getimages (&Nimage, NULL);
 
-  // XXX I think this is OK in the ubercal context, but probably need to skip UBERCAL
-  // images? (no need to update them)
+  fprintf (stderr, "*** return Mcal from mosaic.Mcal to image.Mcal ***\n");
 
   // copy the mosaic results to the images.  set the mosaic Mcal to 0.0 since we have moved its
@@ -1267 +1223 @@
 
   if (testImage) {
-    fprintf (stderr, "%f %f  :  %f\n", myMosaic[0].Mcal, myMosaic[0].dMsys, myMosaic[0].Xm);
+    fprintf (stderr, "%f %f  :  %f\n", myMosaic[0].Mcal, myMosaic[0].dMsys, pow (10.0, 0.01*myMosaic[0].Xm));
   }
 
@@ -1620 +1576 @@
     if (mosaic[i].flags & IMAGE_BAD) continue;
     if (mosaic[i].skipCal) continue;
+    if (KEEP_UBERCAL && (mosaic[i].flags & ID_IMAGE_PHOTOM_UBERCAL)) continue;
+
     list[n] = mosaic[i].Mcal;
     dlist[n] = 1;
@@ -1650 +1608 @@
     if (mosaic[i].flags & IMAGE_BAD) continue;
     if (mosaic[i].skipCal) continue;
+    if (KEEP_UBERCAL && (mosaic[i].flags & ID_IMAGE_PHOTOM_UBERCAL)) continue;
+
     list[n] = mosaic[i].dMcal;
     dlist[n] = 1;
@@ -1681 +1641 @@
     if (mosaic[i].flags & IMAGE_BAD)  continue;
     if (mosaic[i].skipCal) continue;
+    if (KEEP_UBERCAL && (mosaic[i].flags & ID_IMAGE_PHOTOM_UBERCAL)) continue;
 
     N = 0;
@@ -1727 +1688 @@
     if (mosaic[i].flags & IMAGE_BAD) continue;
     if (mosaic[i].skipCal) continue;
+    if (KEEP_UBERCAL && (mosaic[i].flags & ID_IMAGE_PHOTOM_UBERCAL)) continue;
+
     list[n]  = pow (10.0, 0.01*mosaic[i].Xm);
     dlist[n] = 1;

branches/eam_branches/ipp-20140610/Ohana/src/relphot/src/Shutdown.c

@@ -23 +23 @@
   SetProtect (TRUE);
   if (db) gfits_db_close (db);
-  fprintf (stderr, "ERROR: addstar halted\n");
+  fprintf (stderr, "ERROR: relphot halted\n");
   exit (1);
 }

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

@@ -25 +25 @@
 
   if (MOSAIC_ZEROPT) {
-    makeMosaics (image, Nimage);
+    makeMosaics (image, Nimage, FALSE);
 
     // center coords and Mcal, dMcal, Mchisq for the mosaics

branches/eam_branches/ipp-20140610/Ohana/src/relphot/src/launch_region_hosts.c

@@ -55 +55 @@
 
     char command[1024];
-    snprintf (command, 1024, "relphot %s -parallel-images %s -region-hosts %s -region-hostID %d -D CATDIR %s -region %f %f %f %f -statmode %s -D CAMERA %s -D STAR_TOOFEW %d -minerror %f", 
-              PhotcodeList, filename, REGION_FILE, host->hostID, CATDIR, host->RminCat, host->RmaxCat, host->DminCat, host->DmaxCat, STATMODE, CAMERA, STAR_TOOFEW, MIN_ERROR);
+    snprintf (command, 1024, "relphot %s", PhotcodeList);
+    strextend (command, "-parallel-images %s", filename);
+    strextend (command, "-region-hosts %s", REGION_FILE);
+    strextend (command, "-region-hostID %d", host->hostID);
+    strextend (command, "-D CATDIR %s", CATDIR);
+    strextend (command, "-region %f %f %f %f", host->RminCat, host->RmaxCat, host->DminCat, host->DmaxCat);
+    strextend (command, "-statmode %s", STATMODE);
+    strextend (command, "-D CAMERA %s", CAMERA);
+    strextend (command, "-D STAR_TOOFEW %d", STAR_TOOFEW);
+    strextend (command, "-minerror %f", MIN_ERROR);
+    strextend (command, "-cloud-limit %f", CLOUD_TOLERANCE);
 
     if (VERBOSE)             strextend (command, "-v");

branches/eam_branches/ipp-20140610/Ohana/src/relphot/src/relphot_parallel_images.c

@@ -38 +38 @@
   // unlink (IMAGE_TABLE); // XXX a bit risky, add some protection?
 
-  // XXX need to deal with mosaic vs image...
-  makeMosaics (image, Nimage);
+  makeMosaics (image, Nimage, TRUE);
 
   initImages (image, NULL, Nimage);

branches/eam_branches/ipp-20140610/Ohana/src/relphot/src/setMrelCatalog.c

@@ -159 +159 @@
 
       // are we a PS1 exposure photcode?
-      if ((measureT[k].photcode >= 10000) && (measureT[k].photcode <= 10500)) {
-        NexpPS1 ++;
-      }
+      if (isGPC1chip(measureT[k].photcode)) NexpPS1 ++;
 
       // SKIP gpc1 stack data
-      if ((measureT[k].photcode >= 11000) && (measureT[k].photcode <= 11500)) {
-        continue;
-      }
+      if (isGPC1stack(measureT[k].photcode)) continue;
 
       // SKIP gpc1 forced-warp data
-      if ((measureT[k].photcode >= 12000) && (measureT[k].photcode <= 12500)) {
-        continue;
-      }
+      if (isGPC1warp(measureT[k].photcode)) continue;
 
       if (measureT[k].dbFlags & MEAS_BAD) SKIP_THIS_MEAS(Nbad); 
@@ -497 +491 @@
 
       // only examine gpc1 stack data
-      // XXX this is absurdly hardwired (along with several photcode tests)
-      if (measure[k].photcode < 11000) continue;
-      if (measure[k].photcode > 11400) continue;
+      if (!isGPC1stack(measure[k].photcode)) continue;
 
       haveStack = TRUE;
@@ -695 +687 @@
     for (k = 0; k < average[0].Nmeasure; k++, meas++) {
 
-      // skip measurements which are not ForcedWarp values
-      if ((measure[k].photcode < 12000) || (measure[k].photcode > 12500)) continue;
+      // only examine gpc1 forced-warp data
+      if (!isGPC1warp(measure[k].photcode)) continue;
 
       // skip measurements that do not match the current photcode