Index: trunk/tools/eam/teleff/camstats.sh
===================================================================
--- trunk/tools/eam/teleff/camstats.sh	(revision 41712)
+++ trunk/tools/eam/teleff/camstats.sh	(revision 41716)
@@ -1,88 +1,2 @@
-
-macro test.mpcfine
-  if ($0 != 2)
-    echo "USAGE: test.mpcfine (file)"
-    break
-  end
-
-  data $1
-  read Rr 1 Dr 2 Rc 4 Dc 5 Rp 7 Dp 8 Ra 10 Da 11 Rd 13 Dd 14
-  set dRc = 3600*(Rc - Rr)*dcos(Dr)
-  set dDc = 3600*(Dc - Dr)
-  set dRp = 3600*(Rp - Rc)*dcos(Dr)
-  set dDp = 3600*(Dp - Dc)
-  set dRa = 3600*(Ra - Rp)*dcos(Dr)
-  set dDa = 3600*(Da - Dp)
-  set dRd = 3600*(Rd - Ra)*dcos(Dr)
-  set dDd = 3600*(Dd - Da)
-
-  vstat dRc
-  vstat dRp
-  vstat dRa
-  vstat dRd
-
-end
-
-macro test.mpcorb
-  if ($0 != 3)
-    echo "USAGE: test.mpcorb (version) (options)"
-    break
-  end
-
-  local Version
-  $Version = $1
-  $Options = $2
-
-  echo mpcorb_predict moment trange.59396.fits 59375.31398 {200.738197150704-2} {200.738197150704+2} {6.13117829483755-2} {6.13117829483755+2} o9375g0065o.am$Version.fits $Options
-  exec mpcorb_predict moment trange.59396.fits 59375.31398 {200.738197150704-2} {200.738197150704+2} {6.13117829483755-2} {6.13117829483755+2} o9375g0065o.am$Version.fits $Options
-  get.camera.matches o9375g0065o.1795013.cm.2420887.smf o9375g0065o.am$Version.fits o9375g0065o.t1/o9375g0065o.t1 am$Version
-  load.camstats.glob o9375g0065o.t1/o9375g0065o.t1.XY*.am$Version.cam.stf
-
-  set dX$Version = Xpsf - Xref
-  set dY$Version = Ypsf - Yref
-
-  set dR$Version = 3600*(Rpsf - Rref)*dcos(Dref)
-  set dD$Version = 3600*(Dpsf - Dref)
-
-  plot -pt cir -sz 2 -op 0.3 dR$Version dD$Version
-end
-
-macro replot.mpcorb
-  if ($0 != 3)
-    echo "USAGE: test.mpcorb (version) (color)"
-    break
-  end
-
-  plot -pt cir -sz 2 -op 0.3 dR$1 dD$1 -c $2
-end
-
-macro load.camstats.glob
- if ($0 != 2)
-   echo "USAGE: load.camstats.glob (glob)"
-   break
- end
- 
- delete -q Rref Dref Xref Yref Q1ref Xpsf Ypsf Rpsf Dpsf Q1psf
-
- list name -glob $1
- for i 0 $name:n
-
-   data $name:$i
-   read -fits DATA -sizes
-   if ($table:Ny == 0) continue
-   read -fits DATA -list-fields -q; list tfields -join allfields; read -fits DATA $allfields
-
-   concat RrefSS Rref
-   concat DrefSS Dref
-   concat XrefSS Xref
-   concat YrefSS Yref
-   concat Q1refSS Q1ref
-   concat X_PSF_found Xpsf
-   concat Y_PSF_found Ypsf
-   concat RA_PSF_found Rpsf
-   concat DEC_PSF_found Dpsf
-   concat Q1_PSF_found Q1psf
- end
-end
 
 macro camstats.glob
@@ -138,5 +52,7 @@
  set dfracOK    = sqrt(numOK_sum)    / numTotal_sum
 
+ break -auto off
  threshold -q -r magFound fracFound 0.25 -range 25 {magFound[]-1}
+ break -auto on
  $MagLim = $threshold
 
@@ -208,5 +124,5 @@
  $Mmin = 10
  $Mmax = 25
- $Mdel = 0.25
+ $Mdel = 0.5
  
  delete -q fracFound magFound numFound numTotal numPoss fracPoss numOK fracOK
@@ -258,2 +174,93 @@
   cplot -c red  -op 1.0 -pt box -sz 2.5 RrefCam DrefCam where (not(isnan(Xpsf)) && (Q1psf > 0.85))
 end
+
+############ macros used to test mpcorb_predict
+
+macro test.mpcfine
+  if ($0 != 2)
+    echo "USAGE: test.mpcfine (file)"
+    break
+  end
+
+  data $1
+  read Rr 1 Dr 2 Rc 4 Dc 5 Rp 7 Dp 8 Ra 10 Da 11 Rd 13 Dd 14
+  set dRc = 3600*(Rc - Rr)*dcos(Dr)
+  set dDc = 3600*(Dc - Dr)
+  set dRp = 3600*(Rp - Rc)*dcos(Dr)
+  set dDp = 3600*(Dp - Dc)
+  set dRa = 3600*(Ra - Rp)*dcos(Dr)
+  set dDa = 3600*(Da - Dp)
+  set dRd = 3600*(Rd - Ra)*dcos(Dr)
+  set dDd = 3600*(Dd - Da)
+
+  vstat dRc
+  vstat dRp
+  vstat dRa
+  vstat dRd
+
+end
+
+macro test.mpcorb
+  if ($0 != 3)
+    echo "USAGE: test.mpcorb (version) (options)"
+    break
+  end
+
+  local Version
+  $Version = $1
+  $Options = $2
+
+  echo mpcorb_predict moment trange.59396.v2.fits 59375.31398 {200.738197150704-2} {200.738197150704+2} {6.13117829483755-2} {6.13117829483755+2} o9375g0065o.am$Version.fits
+  exec mpcorb_predict moment trange.59396.v2.fits 59375.31398 {200.738197150704-2} {200.738197150704+2} {6.13117829483755-2} {6.13117829483755+2} o9375g0065o.am$Version.fits
+  get.camera.matches o9375g0065o.1795013.cm.2420887.smf o9375g0065o.am$Version.fits o9375g0065o.t1/o9375g0065o.t1 am$Version
+  load.camstats.glob o9375g0065o.t1/o9375g0065o.t1.XY*.am$Version.cam.stf
+
+  set dX$Version = Xpsf - Xref
+  set dY$Version = Ypsf - Yref
+
+  set dR$Version = 3600*(Rpsf - Rref)*dcos(Dref)
+  set dD$Version = 3600*(Dpsf - Dref)
+
+  plot -pt cir -sz 2 -op 0.3 dR$Version dD$Version
+end
+
+macro replot.mpcorb
+  if ($0 != 3)
+    echo "USAGE: test.mpcorb (version) (color)"
+    break
+  end
+
+  plot -pt cir -sz 2 -op 0.3 dR$1 dD$1 -c $2
+end
+
+macro load.camstats.glob
+ if ($0 != 2)
+   echo "USAGE: load.camstats.glob (glob)"
+   break
+ end
+ 
+ delete -q Rref Dref Mref Xref Yref Q1ref Xpsf Ypsf Rpsf Dpsf Mpsf Q1psf
+
+ list name -glob $1
+ for i 0 $name:n
+
+   data $name:$i
+   read -fits DATA -sizes
+   if ($table:Ny == 0) continue
+   read -fits DATA -list-fields -q; list tfields -join allfields; read -fits DATA $allfields
+
+   concat RrefSS Rref
+   concat DrefSS Dref
+   concat XrefSS Xref
+   concat YrefSS Yref
+   concat MrefSS Mref
+   concat Q1refSS Q1ref
+   concat X_PSF_found Xpsf
+   concat Y_PSF_found Ypsf
+   concat RA_PSF_found Rpsf
+   concat DEC_PSF_found Dpsf
+   concat M_PSF_found Mpsf
+   concat Q1_PSF_found Q1psf
+ end
+end
+