Index: trunk/Ohana/src/libautocode/Makefile.Targets
===================================================================
--- trunk/Ohana/src/libautocode/Makefile.Targets	(revision 37034)
+++ trunk/Ohana/src/libautocode/Makefile.Targets	(revision 37807)
@@ -1,4 +1,5 @@
 AOBJS = \
-$(ASRC)/coords.$(ARCH).o \
+$(ASRC)/coords-disk.$(ARCH).o \
+$(ASRC)/AstromOffsetMap_Disk.$(ARCH).o \
 $(ASRC)/average.$(ARCH).o \
 $(ASRC)/average-loneos.$(ARCH).o \
@@ -13,4 +14,5 @@
 $(ASRC)/average-ps1-v4.$(ARCH).o \
 $(ASRC)/average-ps1-v5.$(ARCH).o \
+$(ASRC)/average-ps1-sim.$(ARCH).o \
 $(ASRC)/average-ps1-ref.$(ARCH).o \
 $(ASRC)/secfilt.$(ARCH).o \
@@ -26,4 +28,5 @@
 $(ASRC)/secfilt-ps1-v4.$(ARCH).o \
 $(ASRC)/secfilt-ps1-v5.$(ARCH).o \
+$(ASRC)/secfilt-ps1-sim.$(ARCH).o \
 $(ASRC)/secfilt-ps1-ref.$(ARCH).o \
 $(ASRC)/measure.$(ARCH).o \
@@ -39,9 +42,14 @@
 $(ASRC)/measure-ps1-v4.$(ARCH).o \
 $(ASRC)/measure-ps1-v5.$(ARCH).o \
+$(ASRC)/measure-ps1-sim.$(ARCH).o \
 $(ASRC)/measure-ps1-ref.$(ARCH).o \
 $(ASRC)/lensing.$(ARCH).o \
 $(ASRC)/lensing-ps1-v5.$(ARCH).o \
+$(ASRC)/lensing-ps1-v5-alt.$(ARCH).o \
 $(ASRC)/lensobj.$(ARCH).o \
 $(ASRC)/lensobj-ps1-v5.$(ARCH).o \
+$(ASRC)/starpar.$(ARCH).o \
+$(ASRC)/starpar-ps1-v5.$(ARCH).o \
+$(ASRC)/starpar-ps1-sim.$(ARCH).o \
 $(ASRC)/missing.$(ARCH).o \
 $(ASRC)/photcode.$(ARCH).o \
@@ -56,5 +64,4 @@
 $(ASRC)/photcode-ps1-v5.$(ARCH).o \
 $(ASRC)/photcode-ps1-ref.$(ARCH).o \
-$(ASRC)/image.$(ARCH).o \
 $(ASRC)/image-loneos.$(ARCH).o \
 $(ASRC)/image-elixir.$(ARCH).o \
@@ -69,4 +76,5 @@
 $(ASRC)/image-ps1-v4.$(ARCH).o \
 $(ASRC)/image-ps1-v5.$(ARCH).o \
+$(ASRC)/image-ps1-sim.$(ARCH).o \
 $(ASRC)/image-ps1-ref.$(ARCH).o \
 $(ASRC)/regimage.$(ARCH).o \
@@ -98,5 +106,6 @@
 
 AINCS = \
-$(AINC)/coords.h \
+$(AINC)/coords-disk.h \
+$(AINC)/AstromOffsetMap_Disk.h \
 $(AINC)/average.h \
 $(AINC)/average-loneos.h \
@@ -111,4 +120,5 @@
 $(AINC)/average-ps1-v4.h \
 $(AINC)/average-ps1-v5.h \
+$(AINC)/average-ps1-sim.h \
 $(AINC)/average-ps1-ref.h \
 $(AINC)/secfilt.h \
@@ -124,4 +134,5 @@
 $(AINC)/secfilt-ps1-v4.h \
 $(AINC)/secfilt-ps1-v5.h \
+$(AINC)/secfilt-ps1-sim.h \
 $(AINC)/secfilt-ps1-ref.h \
 $(AINC)/measure.h \
@@ -137,9 +148,14 @@
 $(AINC)/measure-ps1-v4.h \
 $(AINC)/measure-ps1-v5.h \
+$(AINC)/measure-ps1-sim.h \
 $(AINC)/measure-ps1-ref.h \
 $(AINC)/lensing.h \
 $(AINC)/lensing-ps1-v5.h \
+$(AINC)/lensing-ps1-v5-alt.h \
 $(AINC)/lensobj.h \
 $(AINC)/lensobj-ps1-v5.h \
+$(AINC)/starpar.h \
+$(AINC)/starpar-ps1-v5.h \
+$(AINC)/starpar-ps1-sim.h \
 $(AINC)/missing.h \
 $(AINC)/photcode.h \
@@ -154,5 +170,4 @@
 $(AINC)/photcode-ps1-v5.h \
 $(AINC)/photcode-ps1-ref.h \
-$(AINC)/image.h \
 $(AINC)/image-loneos.h \
 $(AINC)/image-elixir.h \
@@ -167,4 +182,5 @@
 $(AINC)/image-ps1-v4.h \
 $(AINC)/image-ps1-v5.h \
+$(AINC)/image-ps1-sim.h \
 $(AINC)/image-ps1-ref.h \
 $(AINC)/regimage.h \