Index: /branches/eam_branches/ipp-20130509/psphot/test/tap_psphot_galaxygrid.pro
===================================================================
--- /branches/eam_branches/ipp-20130509/psphot/test/tap_psphot_galaxygrid.pro	(revision 35700)
+++ /branches/eam_branches/ipp-20130509/psphot/test/tap_psphot_galaxygrid.pro	(revision 35701)
@@ -123,4 +123,69 @@
 end
 
+macro go.grid.set.sersic
+  $FakeConfig = -camera SIMTEST
+  $FakeConfig = $FakeConfig -recipe PPSIM STACKTEST.RUN
+  $FakeConfig = $FakeConfig -D PSASTRO:PSASTRO.CATDIR catdir.ref
+  $FakeConfig = $FakeConfig -Db STARS.FAKE F                         ; # only use stars from catdir.ref
+  $FakeConfig = $FakeConfig -Db MATCH.DENSITY F
+  $FakeConfig = $FakeConfig -Db PSF.CONVOLVE T
+  $FakeConfig = $FakeConfig -Db GALAXY.FAKE T                        ; # generate a "realistic" distribution of galaxies
+  $FakeConfig = $FakeConfig -Df GALAXY.MAG 17.0
+  $FakeConfig = $FakeConfig -Db GALAXY.GRID T                        ; # generate a grid of galaxies (constant mag)
+  $FakeConfig = $FakeConfig -Df GALAXY.THETA.MIN 0 
+  $FakeConfig = $FakeConfig -Df GALAXY.THETA.MAX 180
+  $FakeConfig = $FakeConfig -Di GALAXY.GRID.DX 120
+  $FakeConfig = $FakeConfig -Di GALAXY.GRID.DY 120
+  $FakeConfig = $FakeConfig -D GALAXY.MODEL PS_MODEL_SERSIC
+
+  # $FakeConfig = $FakeConfig -Df GALAXY.INDEX.MIN 1.0
+  # $FakeConfig = $FakeConfig -Df GALAXY.INDEX.MAX 1.0
+  # $FakeConfig = $FakeConfig -Df GALAXY.RMAJOR.MIN 10.0
+  # $FakeConfig = $FakeConfig -Df GALAXY.RMAJOR.MAX 10.0
+  # $FakeConfig = $FakeConfig -Df GALAXY.ARATIO.MIN 0.25
+  # $FakeConfig = $FakeConfig -Df GALAXY.ARATIO.MAX 0.25
+  # $FakeConfig = $FakeConfig -Df GALAXY.INDEX.MIN 1.66
+  # $FakeConfig = $FakeConfig -Df GALAXY.INDEX.MAX 1.66
+
+  $Nseq = 0
+  foreach index 1 2 3 4
+    foreach Rmajor 3 10 30
+      foreach Aratio 0.25 0.5 1.0
+        foreach fwhm 0.8 1.0 1.5
+          $FakeConfig = $FakeConfig -Df GALAXY.RMAJOR.MIN $Rmajor
+          $FakeConfig = $FakeConfig -Df GALAXY.RMAJOR.MAX $Rmajor
+          $FakeConfig = $FakeConfig -Df GALAXY.ARATIO.MIN $Aratio
+          $FakeConfig = $FakeConfig -Df GALAXY.ARATIO.MAX $Aratio
+  	  $FakeConfig = $FakeConfig -Df GALAXY.INDEX.MIN $index
+  	  $FakeConfig = $FakeConfig -Df GALAXY.INDEX.MAX $index
+	  
+          sprint name "sersic.%02d" $Nseq
+          mkexp $name $fwhm SERSIC
+          fitexp $name $name.fit SER\_CONV
+	  $Nseq ++
+        end
+      end
+    end
+  end
+end
+
+macro go.grid.check.devexp
+  delete -q Xin_s Yin_s Min_s Tin_s Rin_s rin_s
+  delete -q Xot_s Yot_s Mot_s Tot_s Rot_s rot_s
+
+  $Nseq = 0
+  foreach type EXP DEV
+    foreach Rmajor 3 10 30
+      foreach Aratio 0.25 0.5 1.0
+        foreach fwhm 0.8 1.0 1.5
+          sprint name "sample.%02d" $Nseq
+          ckgalaxy.load $name.dat $name.fit.cmf
+	  $Nseq ++
+        end
+      end
+    end
+  end
+end
+
 macro go
   mkexp test.exp 1.0 EXP
@@ -267,5 +332,5 @@
 end
 
-macro ckgalaxy
+macro ckgalaxy.load
   if ($0 != 3)
     echo "USAGE: ckgalaxy (dat) (cmf)"
@@ -279,5 +344,7 @@
   subset Yin = Yin_all if (Type == 1)
   subset Min = Min_all if (Type == 1)
-  subset Tin = ThetaIn_all if (Type == 1)
+
+  subset Tin_rad = ThetaIn_all if (Type == 1)
+  set Tin = Tin_rad * 180 / 3.14159265
 
   subset RmajIn = RmajIn_all if (Type == 1)
@@ -287,5 +354,5 @@
   read -fits Chip.xfit X_EXT Y_EXT EXT_INST_MAG EXT_WIDTH_MAJ EXT_WIDTH_MIN EXT_THETA
   set EXT_THETA_ALT = EXT_THETA * (EXT_THETA >= 0.0) + (EXT_THETA + 3.14159265) * (EXT_THETA < 0.0)
-  set EXT_THETA = EXT_THETA_ALT
+  set EXT_THETA = EXT_THETA_ALT * 180 / 3.14159265
   
   match2d X_EXT Y_EXT Xin Yin 1.0 -index1 index1 -index2 index2
@@ -297,8 +364,4 @@
   reindex Yin_m = Yin using index2
 
-  set dX = Xin_m - Xot_m  
-  set dY = Yin_m - Yot_m  
-  # lim -n 0 dX dY; clear; box; plot dX dY
-
   reindex Mot_m = EXT_INST_MAG using index1
   reindex Tot_m = EXT_THETA using index1
@@ -312,20 +375,10 @@
   reindex Rin_m = RmajIn using index2
   reindex rin_m = RminIn using index2
-
-  set n = ramp(Xin_m)
-
-  set dM = Min_m - Mot_m  
-  set dT = (Tin_m - Tot_m) * 180 / 3.14159265
-  set Tin_deg = Tin_m * 180 / 3.14159265
-
-  lim -n 0 Tin_deg -5 5; clear; box; plot Tin_deg dT; label -y "delta theta (deg)"
-  lim -n 1 n dM; clear; box; plot n dM; label -y "delta mag"
-  lim -n 2 n -5 5; clear; box; plot n dT; label -y "delta theta (deg)"
-  lim -n 3 -5 5 dM; clear; box; plot dT dM; label -x "delta theta (deg)" -y "delta mag"
-
-  set dR = Rin_m - Rot_m  
-  set dr = rin_m - rot_m
-  lim -n 4 n dR; clear; box; plot n dR; label -y "delta Rmaj"
-  lim -n 5 n dr; clear; box; plot n dr; label -y "delta Rmin"
+  
+  foreach field X Y M T R r 
+    foreach set in ot
+      concat $field\$set\_m $field\$set\_s
+    end
+  end
 end