Index: trunk/FACT++/Makefile.in
===================================================================
--- trunk/FACT++/Makefile.in	(revision 10809)
+++ trunk/FACT++/Makefile.in	(revision 10810)
@@ -47,9 +47,9 @@
 	INSTALL NEWS
 bin_PROGRAMS = $(am__EXEEXT_1) dns$(EXEEXT) log$(EXEEXT) \
-	logtime$(EXEEXT) time$(EXEEXT) argv$(EXEEXT) test3$(EXEEXT) \
+	logtime$(EXEEXT) time$(EXEEXT) argv$(EXEEXT) dimctrl$(EXEEXT) \
 	dclient5$(EXEEXT) dserver2$(EXEEXT) dataLogger$(EXEEXT) \
 	scheduler$(EXEEXT) triggerschedule$(EXEEXT) ftmctrl$(EXEEXT) \
-	ftm$(EXEEXT) fadctrl$(EXEEXT) fitsloader$(EXEEXT) \
-	fitsdump$(EXEEXT) $(am__EXEEXT_2) $(am__EXEEXT_3)
+	ftm$(EXEEXT) fadctrl$(EXEEXT) fitsdump$(EXEEXT) \
+	$(am__EXEEXT_2) $(am__EXEEXT_3)
 @HAS_LIBXP_TRUE@am__append_1 = did
 
@@ -58,5 +58,5 @@
 @IS_FALSE@	test \
 @IS_FALSE@	chatclient chatserv \
-@IS_FALSE@	fitsgrep test \
+@IS_FALSE@	fitsloader fitsgrep test \
 @IS_FALSE@	sched astro drivectrl
 
@@ -153,6 +153,7 @@
 @HAS_LIBXP_TRUE@am__EXEEXT_2 = did$(EXEEXT)
 @IS_FALSE@am__EXEEXT_3 = test$(EXEEXT) chatclient$(EXEEXT) \
-@IS_FALSE@	chatserv$(EXEEXT) fitsgrep$(EXEEXT) test$(EXEEXT) \
-@IS_FALSE@	sched$(EXEEXT) astro$(EXEEXT) drivectrl$(EXEEXT)
+@IS_FALSE@	chatserv$(EXEEXT) fitsloader$(EXEEXT) \
+@IS_FALSE@	fitsgrep$(EXEEXT) test$(EXEEXT) sched$(EXEEXT) \
+@IS_FALSE@	astro$(EXEEXT) drivectrl$(EXEEXT)
 PROGRAMS = $(bin_PROGRAMS)
 am_argv_OBJECTS = src/argv.$(OBJEXT)
@@ -188,4 +189,8 @@
 did_OBJECTS = $(am_did_OBJECTS)
 did_DEPENDENCIES = libDim.la
+am_dimctrl_OBJECTS = src/dimctrl.$(OBJEXT) src/RemoteControl.$(OBJEXT)
+dimctrl_OBJECTS = $(am_dimctrl_OBJECTS)
+dimctrl_DEPENDENCIES = libTools.la libStateMachine.la libTime.la \
+	libDim.la libDim++.la libConfiguration.la
 am_dns_OBJECTS = dim/src/dns.$(OBJEXT)
 dns_OBJECTS = $(am_dns_OBJECTS)
@@ -266,8 +271,4 @@
 test_DEPENDENCIES = libTools.la libStateMachine.la libTime.la \
 	libDim.la libDim++.la libConfiguration.la
-am_test3_OBJECTS = src/test3.$(OBJEXT) src/RemoteControl.$(OBJEXT)
-test3_OBJECTS = $(am_test3_OBJECTS)
-test3_DEPENDENCIES = libTools.la libStateMachine.la libTime.la \
-	libDim.la libDim++.la libConfiguration.la
 am_time_OBJECTS = src/time.$(OBJEXT)
 time_OBJECTS = $(am_time_OBJECTS)
@@ -325,10 +326,10 @@
 	astro.c $(chatclient_SOURCES) $(chatserv_SOURCES) \
 	$(dataLogger_SOURCES) $(dclient5_SOURCES) $(did_SOURCES) \
-	$(dns_SOURCES) $(drivectrl_SOURCES) $(dserver2_SOURCES) \
-	$(fact_SOURCES) $(fadctrl_SOURCES) $(fitsdump_SOURCES) \
-	fitsgrep.c $(fitsloader_SOURCES) $(ftm_SOURCES) \
-	$(ftmctrl_SOURCES) $(log_SOURCES) $(logtime_SOURCES) sched.c \
-	$(scheduler_SOURCES) $(test_SOURCES) $(test3_SOURCES) \
-	$(time_SOURCES) $(triggerschedule_SOURCES)
+	$(dimctrl_SOURCES) $(dns_SOURCES) $(drivectrl_SOURCES) \
+	$(dserver2_SOURCES) $(fact_SOURCES) $(fadctrl_SOURCES) \
+	$(fitsdump_SOURCES) fitsgrep.c $(fitsloader_SOURCES) \
+	$(ftm_SOURCES) $(ftmctrl_SOURCES) $(log_SOURCES) \
+	$(logtime_SOURCES) sched.c $(scheduler_SOURCES) \
+	$(test_SOURCES) $(time_SOURCES) $(triggerschedule_SOURCES)
 DIST_SOURCES = $(libConfiguration_la_SOURCES) $(libDim___la_SOURCES) \
 	$(libDim_la_SOURCES) $(libStateMachine_la_SOURCES) \
@@ -336,11 +337,11 @@
 	astro.c $(chatclient_SOURCES) $(chatserv_SOURCES) \
 	$(am__dataLogger_SOURCES_DIST) $(dclient5_SOURCES) \
-	$(did_SOURCES) $(dns_SOURCES) $(drivectrl_SOURCES) \
-	$(dserver2_SOURCES) $(am__fact_SOURCES_DIST) \
-	$(fadctrl_SOURCES) $(fitsdump_SOURCES) fitsgrep.c \
-	$(fitsloader_SOURCES) $(ftm_SOURCES) $(ftmctrl_SOURCES) \
-	$(log_SOURCES) $(logtime_SOURCES) sched.c $(scheduler_SOURCES) \
-	$(test_SOURCES) $(test3_SOURCES) $(time_SOURCES) \
-	$(triggerschedule_SOURCES)
+	$(did_SOURCES) $(dimctrl_SOURCES) $(dns_SOURCES) \
+	$(drivectrl_SOURCES) $(dserver2_SOURCES) \
+	$(am__fact_SOURCES_DIST) $(fadctrl_SOURCES) \
+	$(fitsdump_SOURCES) fitsgrep.c $(fitsloader_SOURCES) \
+	$(ftm_SOURCES) $(ftmctrl_SOURCES) $(log_SOURCES) \
+	$(logtime_SOURCES) sched.c $(scheduler_SOURCES) \
+	$(test_SOURCES) $(time_SOURCES) $(triggerschedule_SOURCES)
 man1dir = $(mandir)/man1
 NROFF = nroff
@@ -617,5 +618,5 @@
 # 	libAstro.la
 @HAS_HELP2MAN_TRUE@dist_man1_MANS = \
-@HAS_HELP2MAN_TRUE@	test3.man ftmctrl.man dataLogger.man triggerschedule.man fitsdump.man
+@HAS_HELP2MAN_TRUE@	dimctrl.man ftmctrl.man dataLogger.man triggerschedule.man fitsdump.man
 
 
@@ -758,6 +759,6 @@
 argv_SOURCES = src/argv.cc
 argv_LDADD = libConfiguration.la 
-test3_SOURCES = src/test3.cc src/RemoteControl.cc src/RemoteControl.h
-test3_LDADD = libTools.la libStateMachine.la libTime.la libDim.la libDim++.la libConfiguration.la
+dimctrl_SOURCES = src/dimctrl.cc src/RemoteControl.cc src/RemoteControl.h
+dimctrl_LDADD = libTools.la libStateMachine.la libTime.la libDim.la libDim++.la libConfiguration.la
 chatclient_SOURCES = src/chatclient.cc src/ChatClient.h
 chatclient_LDADD = libTools.la libStateMachine.la libTime.la libDim.la libDim++.la libConfiguration.la
@@ -1081,4 +1082,11 @@
 	@rm -f did$(EXEEXT)
 	$(AM_V_CCLD)$(LINK) $(did_OBJECTS) $(did_LDADD) $(LIBS)
+src/dimctrl.$(OBJEXT): src/$(am__dirstamp) \
+	src/$(DEPDIR)/$(am__dirstamp)
+src/RemoteControl.$(OBJEXT): src/$(am__dirstamp) \
+	src/$(DEPDIR)/$(am__dirstamp)
+dimctrl$(EXEEXT): $(dimctrl_OBJECTS) $(dimctrl_DEPENDENCIES) 
+	@rm -f dimctrl$(EXEEXT)
+	$(AM_V_CXXLD)$(CXXLINK) $(dimctrl_OBJECTS) $(dimctrl_LDADD) $(LIBS)
 dim/src/dns.$(OBJEXT): dim/src/$(am__dirstamp) \
 	dim/src/$(DEPDIR)/$(am__dirstamp)
@@ -1176,10 +1184,4 @@
 	@rm -f test$(EXEEXT)
 	$(AM_V_CXXLD)$(CXXLINK) $(test_OBJECTS) $(test_LDADD) $(LIBS)
-src/test3.$(OBJEXT): src/$(am__dirstamp) src/$(DEPDIR)/$(am__dirstamp)
-src/RemoteControl.$(OBJEXT): src/$(am__dirstamp) \
-	src/$(DEPDIR)/$(am__dirstamp)
-test3$(EXEEXT): $(test3_OBJECTS) $(test3_DEPENDENCIES) 
-	@rm -f test3$(EXEEXT)
-	$(AM_V_CXXLD)$(CXXLINK) $(test3_OBJECTS) $(test3_LDADD) $(LIBS)
 src/time.$(OBJEXT): src/$(am__dirstamp) src/$(DEPDIR)/$(am__dirstamp)
 time$(EXEEXT): $(time_OBJECTS) $(time_DEPENDENCIES) 
@@ -1307,4 +1309,5 @@
 	-rm -f src/dataLogger.$(OBJEXT)
 	-rm -f src/dclient5.$(OBJEXT)
+	-rm -f src/dimctrl.$(OBJEXT)
 	-rm -f src/drivectrl.$(OBJEXT)
 	-rm -f src/dserver2.$(OBJEXT)
@@ -1318,5 +1321,4 @@
 	-rm -f src/scheduler.$(OBJEXT)
 	-rm -f src/test.$(OBJEXT)
-	-rm -f src/test3.$(OBJEXT)
 	-rm -f src/time.$(OBJEXT)
 	-rm -f src/tools.$(OBJEXT)
@@ -1398,4 +1400,5 @@
 @AMDEP_TRUE@@am__include@ @am__quote@src/$(DEPDIR)/dataLogger.Po@am__quote@
 @AMDEP_TRUE@@am__include@ @am__quote@src/$(DEPDIR)/dclient5.Po@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@src/$(DEPDIR)/dimctrl.Po@am__quote@
 @AMDEP_TRUE@@am__include@ @am__quote@src/$(DEPDIR)/drivectrl.Po@am__quote@
 @AMDEP_TRUE@@am__include@ @am__quote@src/$(DEPDIR)/dserver2.Po@am__quote@
@@ -1409,5 +1412,4 @@
 @AMDEP_TRUE@@am__include@ @am__quote@src/$(DEPDIR)/scheduler.Po@am__quote@
 @AMDEP_TRUE@@am__include@ @am__quote@src/$(DEPDIR)/test.Po@am__quote@
-@AMDEP_TRUE@@am__include@ @am__quote@src/$(DEPDIR)/test3.Po@am__quote@
 @AMDEP_TRUE@@am__include@ @am__quote@src/$(DEPDIR)/time.Po@am__quote@
 @AMDEP_TRUE@@am__include@ @am__quote@src/$(DEPDIR)/tools.Plo@am__quote@