Index: trunk/tools/eam/teleff/cammask.pro
===================================================================
--- trunk/tools/eam/teleff/cammask.pro	(revision 41716)
+++ trunk/tools/eam/teleff/cammask.pro	(revision 41717)
@@ -8,7 +8,7 @@
 if (not($?MATCH_RADIUS)) set MATCH_RADIUS = 2.0
 
-$SMF_FIELDS = X_PSF Y_PSF RA_PSF DEC_PSF CAL_PSF_MAG PSF_QF PSF_QF_PERFECT
-$REF_FIELDS = Rref Dref Mref 
-$XTR_FIELDS = Xref Yref Nref Q1ref
+$SMF_FIELDS_CAM = X_PSF Y_PSF RA_PSF DEC_PSF CAL_PSF_MAG PSF_QF PSF_QF_PERFECT
+$REF_FIELDS_CAM = Rref Dref Mref 
+$XTR_FIELDS_CAM = Xref Yref Nref Q1ref
 
 macro get.camera.eff
@@ -46,5 +46,5 @@
  # load the reference source table
  # NOTE: Mref is chosen to match filter for this exposure
- data $refsrcs; read -fits DATA $REF_FIELDS
+ data $refsrcs; read -fits DATA $REF_FIELDS_CAM
  set Nref = ramp(Rref)
 
@@ -70,9 +70,9 @@
    get.chip.mask.stats $camMask:$i
 
-   foreach field SMF_FIELDS
+   foreach field SMF_FIELDS_CAM
      concat $field\_found $field\_out
      delete $field\_found
    end
-   foreach field REF_FIELDS $XTR_FIELDS
+   foreach field REF_FIELDS_CAM $XTR_FIELDS_CAM
      concat $field\_onchp $field\_out
      delete $field\_onchp
@@ -81,9 +81,9 @@
 
  $OUT_FIELDS = 
- foreach field $SMP_FIELDS $REF_FIELDS $XTR_FIELDS
+ foreach field $SMP_FIELDS_CAM $REF_FIELDS_CAM $XTR_FIELDS_CAM
    $OUT_FIELDS = $OUT_FIELDS $field\_out
  end
 
- sprintf output "%s/%s.%s.%s.cam.stf" $OUTDIR $expname $chipName:$i $OUTVERSION
+ sprintf output "%s/%s.%s.cam.stf" $OUTDIR $expname $OUTVERSION
  write -fits DATA $output $OUT_FIELDS
 end
@@ -127,5 +127,5 @@
   # do we need to grow the range at all?
   set keep = (Rref >= $minR) && (Rref <= $maxR) && (Dref >= $minD) && (Dref <= $maxD) 
-  foreach field $REF_FIELDS Nref
+  foreach field $REF_FIELDS_CAM Nref
     subset $field\_tmp = $field if keep
   end
@@ -138,5 +138,5 @@
   # generate a subset of sources which are within the boundaries of the chip
   set keep = (Xref_tmp >= 0) && (Xref_tmp <= $NAXIS1) && (Yref_tmp >= 0) && (Yref_tmp <= $NAXIS2)
-  foreach field $REF_FIELDS Nref Xref Yref
+  foreach field $REF_FIELDS_CAM Nref Xref Yref
     subset $field\_onchp = $field\_tmp if keep
     delete $field\_tmp
@@ -148,12 +148,12 @@
   if ($USE_EXTNAME) 
     sprintf extname "%s.psf" $chipname
-    read -fits $extname $SMF_FIELDS
+    read -fits $extname $SMF_FIELDS_CAM
   else
-    read -fits {$chipnseq+1} -extnum $SMF_FIELDS
+    read -fits {$chipnseq+1} -extnum $SMF_FIELDS_CAM
   end
 
   # match radius currently needs to be larger for MPC objects
   match2d Xref_onchp Yref_onchp X_PSF Y_PSF $MATCH_RADIUS -closest
-  foreach field $SMF_FIELDS
+  foreach field $SMF_FIELDS_CAM
     reindex $field\_found = $field using index1 -keep-unmatched
   end
@@ -328,5 +328,5 @@
  # load the reference source table
  # NOTE: Mref is chosen to match filter for this exposure
- data $refsrcs; read -fits DATA $REF_FIELDS
+ data $refsrcs; read -fits DATA $REF_FIELDS_CAM
  set Nref = ramp(Rref)